Revert "Fix USB tether"

This reverts commit 5717d9126738aa7e4afeba0d78b1bb18e8c011c2.

Change-Id: Idaa48a604dd6bd1061626c3de5ebc21bd77a0440
Merge "Revert "Fix USB tether"" into kitkat