This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca. Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e