Fix a change that was accidentally clobbered during merge