Upstream master undo msw