This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9. Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5