This reverts commit 0a4e913d635efb03f901605396fda7401bc38923. Change-Id: Id22747471ac809f1245ec7985d5756453aa94f78