This reverts commit cd5c181b. Reason for revert: To fix build breakage Change-Id: I4ee1a28d3aeb630975ea60ae5606fc92bc5c4652