This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989. Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338