A merge accidentally included a line that was deleted. Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989