Revert ccb5ec9..c75d238

This rolls back to commit ccb5ec9f3d75fa359dcf5793ee2736b366e14f6f.