As best as I can tell, this has *never* been an interface. Change-Id: I42e4b82a7af8a81e497e68ad25ac3bc4d0d74970