These were temporarily reverted because our deployment process isn't in a
good place atm and something else needed to go out.  Considering the
refactoring involved here, I did not want to rush things.

This reverts commit 172eaf49.