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

This reverts commit e8d9b3d75f691c752a97a11446af308784f9c325.