Was supposed to be removed back in Mitaka, according to the comments. Change-Id: I1974b3694ed8d43a22f1f211e3f665adcf04fec6