This reverts commit 251792afa00684534e5e919698bcae2766bb46f6. Change-Id: Ib3da5c9e1f6e5e2d6f77269129bd769179bfd3be