Revert 89ef0bd..dc82811

This rolls back to commit 89ef0bddf6fc2ceb25be2dfd327b06e3f2497960.