This reverts commit Ia33b110337e610ab9b5d7a9cecb61f6952cd3379. Change-Id: I07e2c8565b2aaa6cfd55b262d65ba0269a0a1d8a