Revert e5257c9..408ce9c

This rolls back to commit e5257c9485ced4d60baa8e930839186624c4f6c0.