Laying ground work for connection reviving stuff in #58