Needs reverting. Do this by rebasing your branch against upstream/master.