This reverts commit f715f417d23d0605abcac309135340ac6ce311ce. Change-Id: I4c0c12d8687426cecccf0f8dad710ea42699727b