Revert e4911b7..10576c7

This rolls back to commit e4911b772c4ce8550fe08834ad4e4083652e81ac.