This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb. Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79