Removing Scenery workaround, for compatibility with master/0.2