Removed some workaround code that is no longer needed (the underlying issue was fixed in Scenery).