Manually revert custom changes to master