revert missing stuff after merge