Revert of incorrect merge.