This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b. Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b