This reverts commit f119b52a.

I think @dashpole is no longer on leave but let me know if I'm mistaken
:)