This reverts commit c214426e0c. Reason for revert: This is not unused; broke build internally Change-Id: I18e8b7954256ae015ad32743fa6a75850b00913e
c214426e0c