This reverts commit 417d2004706b6a5055bab7a2af220a221a1bd541. Change-Id: Ie198e7190853ee74be2edfcb9040909a84323092