Reverted incorrect merge