This reverts commit 6d5de06fdec7125b4f36c1aa898c12a0f05bb461. Change-Id: I0091ccacceaecbdd0c8a3eb9ff211c4a93e7ea89