This reverts commit ebdcf57fb088ba09db51a1f2bcbc915731d04bd2. Change-Id: Icfa811571ec7c26617e0f8e9db086001fc0bc81f