back out problematic ogre fixes