This reverts commit c889b4f4. Merged-In: I74306bacad2a61471a9b8c9fd881229b22b6975e Change-Id: I74306bacad2a61471a9b8c9fd881229b22b6975e