Restored a change lost during merge