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