Revert merge mixup