Revert 8a144ec..94aed69

This rolls back to commit 8a144ec968661079619961f6ffe9f0fc5f8a68b3.