Revert incorrect merge.