This reverts commit e5b04669c88868a1966392b7469b039cea9bb370 Change-Id: Ic5aec4848db35bb8a257742981615414b8777dcf