Revert merge as to not rewrite history