Revert "corrections to shadd/uw after reverting to switch"