re-adding old changes after a revert