Fix broken merge.

NEWS:
	As above.