Fix the broken conflict from the revert.