revert revision to work-around merge conflict