Temporary fix for org/windmove.