This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc. Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6