Revert incorrect merge