Revert e7ebbd9..7b9c769

This rolls back to commit e7ebbd9d3edf7d90b2966e9424f59cb81efb7d5a.