This reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274. Change-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72