This reverts commit I513a78639898c6f2bd9ea5418def03d64d7232d0. Change-Id: Ia5952dae9c08a2227b0f6369cfe652007df41919