[FOLD] Fix outgoing attepmts
[FOLD] Put back self-connect code