Revert e95e7e2..a236e42

This rolls back to commit e95e7e273237ceeffe912c3f7e0c93ecf2a6b2f0.