revert three files to upstream/master