Revert e068d5e..e512f1c

This rolls back to commit e068d5ec21728784e53a97766fd0f827029fc98e.