This reverts commit a28e4764994283c3595dd41f12e425cf7dc0d985. Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0