Revert shuttle windows

Same as they were before