reverting master to some sort of sanity