Revert "Improve robustness to temporary network problems."

Revert this since it does not seem to improve the lost connection management
and may have introduced a regression : see #345
This reverts commit ab94d7adb4798d3e8e0bbaeb8340e1580cf7f8a8.