Merge "Undo a fix and de-flake a test"