This reverts commit a8df5632. Reason for revert: Fix build break Change-Id: Ie87f9114f9807d4ccc9a16b675da03f7496b3676