Temporarily backing out synchronous-clone until we fix the skybox bug