Partly revert merge