This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789. Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88