This reverts commit a7ce555ee82ed91345a54ee171dc9a415b65e134. Change-Id: I1018747766963e75bec11ddb01ba6d138f133959