Revert e7d6c02..f77662a

This rolls back to commit e7d6c02fe2d45c9a15eafc6289cb7feb47833ebc.