Fix earlier merge.