Revert "Fixed tether things"

This reverts commit 02d5c0023c69ccb85e0559ea49c0d0d413907ff0.
Revert "Revert "Fixed tether things""

This reverts commit 574e22396241e1dc30a36ad5b184ad34edba7ac1.