revert part of the last merge