Do this again: Manually revert custom changes to master