This reverts commit e30aa408. Reason for revert: resubmit Change-Id: Ief897d6ebe709f66833c3f511f728e88a159b791