Revert 86ca04e66. WTF was Myles doing

This reverts commit 86ca04e66ec8a8f8a372fa010ceeae49f63017b1, reversing
changes made to 28a7e30b282c79cb2c68d998402f782c02df84b6.