This reverts commit fc98399aa4e3837e74b4587df051e9c538fa1462. Change-Id: Ie9562c096f865195bc44e55ea6425ad207d44e50