This reverts commit 17f05f5820. Change-Id: Idc8259a5a2fd209c19a6f548ddf8b1a09ed33966
17f05f5820
a6e89ce3