Revert e65974c..b4c4e51

This rolls back to commit e65974cfb42333381d9a856914046b63b2624768.