Re-add change removed by merge.