This reverts commit 7025765c72. Reason for revert: 274169859 Change-Id: I86a114bf2c713fea6ec7095f68816820ba5f7495
7025765c72