This reverts commit a92c543fd574e027f0de0bd17d8a67090364ef3d. Change-Id: I972e083ac91bd1ecd13b900b417685eda5a4add0