Revert "Merge pull request #105 from jnwatts/feature/better_connection_handling_for_limpkin"

This reverts commit 8bc0734da30840bf190cf04d7381fa1967e86115, reversing
changes made to 3de2e9eace6961922e15768eba5b0123257b5ec6.
Revert "Merge pull request #104 from jnwatts/feature/better_connection_handling_for_limpkin"

This reverts commit 3de2e9eace6961922e15768eba5b0123257b5ec6, reversing
changes made to cafbea08f207c33fc7ecbb4142a85bb544dc5195.
Merge pull request #106 from jnwatts/fix/revert_better_connection_handling_for_limpkin

Fix/revert better connection handling for limpkin