And reset master to known-good again