Revert "start adding tag-based connections"

This reverts commit 72d2b7c3cb071ee2cd45f000de061e98388b5de5.
reverting the master branch to tags/recovery