Revert b3e4b0a..563a474

This rolls back to commit b3e4b0ae3f1b04174326ae1b7c9206ceb4cf9f8e.
Hmm.