This reverts commit 63483e17de4d2441acaabcee4185b0bb25e1d94c. Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18