This reverts commit 19767aebb827abb83229e100a5ae38ff76de6478. Change-Id: I2ccceae409a16598658a2b35ec56b11617dd0afa