Fix overwrite bug that was inadvertently regressed in the merge.