This reverts commit 7d6fa7b405. Change-Id: I69316d5554fe0de04bc4d04acc90121217599597
7d6fa7b405
156139edd8
03a540cc3a