This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc. Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3