Roll back suggested changes in master