This reverts commit 39de459a86.
39de459a86
This reverts commit 8e88cb8478.
8e88cb8478
Change-Id: Id79d11ed08085c4fe356739498a8b77952e30392