Revert to 32470f22336852c43ccf4593486fb1b21f58d3e2

Change-Id: I686b3ab712ae862709bdf66e764836fe2af75c98