Attempt #6 at removing paver

[timmc-edx]

This reverts the previous revert ce176c4 from #140 so I can add a fix on top of it. See second commit.

---

Make sure that the following steps are done before merging:

• Have a Site Reliability Engineer review the PR if you don't own all of the services impacted.
• If you are adding any new default values that need to be overridden when this change goes live, update internal repos and add an entry to the top of the CHANGELOG.
• Performed the appropriate testing.

[robrap]

Looks fine, but can you wait until regular business hours to merge and coordinate with anyone or any team who may have run into issues during attempts 1-5? :)

[timmc-edx]

Yep! Just queuing it up for tomorrow. :-)