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

This reverts commit 22b6fd831ff5840d929e46bdc4e86bcd0f90d573.