This reverts commit 133ad44269e4b45e056793b579a7628aa4d91ccb. Change-Id: I45095211aaa63b133ad5a4076df25823fa91efa3