This reverts commit 6561ccdb9911c8c5d1bd91055cdf5abfcc34e2d9. Change-Id: I3455557b6d3597a8c6eb626a09cadabed3687ec6