Revert e670e3b..578f7e7

This rolls back to commit e670e3b75c0c033fa71c3075dea4e281a8abb980.