Excessive reconnects issue resolution

Fixes #868
This is being fixed in another PR.