Revert "wow; such commit; very push (dropconnect hacks)"

This reverts commit 148832646d99b63feae7d64c099ecfc7b09c7f13.