Fixed up an in-progress change during merge