Remove an XXX that may not be needed

Change-Id: I92eb3940309ae15fe3ecdd52fee73437c4aad992