Revert e166625..912c28f

This rolls back to commit e166625d06c6ad9140301c4cb33feb5af5153a34.