Restore 1sec msg connect retry

This largely reverts commit 0ec2af2735ee91b46fd5b59a9cd1318ef3411aca
just to cut down on some logging