diff --git a/include/qpid/dispatch/router_core.h b/include/qpid/dispatch/router_core.h
index 3ea0b8f51..784acbecc 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -267,7 +267,7 @@ typedef enum {
     QD_ROUTER_CONFIG_ADDRESS,
     QD_ROUTER_CONFIG_AUTO_LINK,
     QD_ROUTER_CONNECTION,
-//  QD_ROUTER_TCP_CONNECTION,
+    QD_ROUTER_TCP_CONNECTION,
     QD_ROUTER_HTTP_REQUEST_INFO,
     QD_ROUTER_ROUTER,
     QD_ROUTER_LINK,
diff --git a/src/router_core/agent.c b/src/router_core/agent.c
index d9d61d65e..e26f4d1d9 100644
--- a/src/router_core/agent.c
+++ b/src/router_core/agent.c
@@ -257,7 +257,7 @@ qdr_query_t *qdr_manage_query(qdr_core_t              *core,
     case QD_ROUTER_CONFIG_AUTO_LINK:  qdr_agent_set_columns(query, attribute_names, qdr_config_auto_link_columns, QDR_CONFIG_AUTO_LINK_COLUMN_COUNT);  break;
     case QD_ROUTER_ROUTER:            qdr_agent_set_columns(query, attribute_names, qdr_router_columns, QDR_ROUTER_COLUMN_COUNT);  break;
     case QD_ROUTER_CONNECTION:        qdr_agent_set_columns(query, attribute_names, qdr_connection_columns, QDR_CONNECTION_COLUMN_COUNT);  break;
-//  case QD_ROUTER_TCP_CONNECTION:    qdr_agent_set_columns(query, attribute_names, qdr_tcp_connection_columns, QDR_TCP_CONNECTION_COLUMN_COUNT);  break;
+    case QD_ROUTER_TCP_CONNECTION:    qdr_agent_set_columns(query, attribute_names, qdr_tcp_connection_columns, QDR_TCP_CONNECTION_COLUMN_COUNT);  break;
     case QD_ROUTER_HTTP_REQUEST_INFO:    qdr_agent_set_columns(query, attribute_names, qdr_http_request_info_columns, QDR_HTTP_REQUEST_INFO_COLUMN_COUNT);  break;
     case QD_ROUTER_LINK:              qdr_agent_set_columns(query, attribute_names, qdr_link_columns, QDR_LINK_COLUMN_COUNT);  break;
     case QD_ROUTER_ADDRESS:           qdr_agent_set_columns(query, attribute_names, qdr_address_columns, QDR_ADDRESS_COLUMN_COUNT); break;
@@ -275,7 +275,7 @@ void qdr_query_add_attribute_names(qdr_query_t *query)
     case QD_ROUTER_CONFIG_AUTO_LINK:  qdr_agent_emit_columns(query, qdr_config_auto_link_columns, QDR_CONFIG_AUTO_LINK_COLUMN_COUNT); break;
     case QD_ROUTER_ROUTER:            qdr_agent_emit_columns(query, qdr_router_columns, QDR_ROUTER_COLUMN_COUNT); break;
     case QD_ROUTER_CONNECTION:        qdr_agent_emit_columns(query, qdr_connection_columns, QDR_CONNECTION_COLUMN_COUNT); break;
-//  case QD_ROUTER_TCP_CONNECTION:    qdr_agent_emit_columns(query, qdr_tcp_connection_columns, QDR_TCP_CONNECTION_COLUMN_COUNT); break;
+    case QD_ROUTER_TCP_CONNECTION:    qdr_agent_emit_columns(query, qdr_tcp_connection_columns, QDR_TCP_CONNECTION_COLUMN_COUNT); break;
     case QD_ROUTER_HTTP_REQUEST_INFO:    qdr_agent_emit_columns(query, qdr_http_request_info_columns, QDR_HTTP_REQUEST_INFO_COLUMN_COUNT); break;
     case QD_ROUTER_LINK:              qdr_agent_emit_columns(query, qdr_link_columns, QDR_LINK_COLUMN_COUNT); break;
     case QD_ROUTER_ADDRESS:           qdr_agent_emit_columns(query, qdr_address_columns, QDR_ADDRESS_COLUMN_COUNT); break;
@@ -408,7 +408,7 @@ static void qdr_manage_read_CT(qdr_core_t *core, qdr_action_t *action, bool disc
         case QD_ROUTER_CONFIG_AUTO_LINK:  qdra_config_auto_link_get_CT(core, name, identity, query, qdr_config_auto_link_columns); break;
         case QD_ROUTER_ROUTER:            qdr_agent_forbidden(core, query, false); break;
         case QD_ROUTER_CONNECTION:        qdra_connection_get_CT(core, name, identity, query, qdr_connection_columns); break;
-//      case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_CT(core, name, identity, query, qdr_tcp_connection_columns); break;
+        case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_CT(core, name, identity, query, qdr_tcp_connection_columns); break;
         case QD_ROUTER_HTTP_REQUEST_INFO: qdra_http_request_info_get_CT(core, name, identity, query, qdr_http_request_info_columns); break;
         case QD_ROUTER_LINK:              break;
         case QD_ROUTER_ADDRESS:           qdra_address_get_CT(core, name, identity, query, qdr_address_columns); break;
@@ -433,7 +433,7 @@ static void qdr_manage_create_CT(qdr_core_t *core, qdr_action_t *action, bool di
         case QD_ROUTER_CONFIG_ADDRESS:    qdra_config_address_create_CT(core, name, query, in_body); break;
         case QD_ROUTER_CONFIG_AUTO_LINK:  qdra_config_auto_link_create_CT(core, name, query, in_body); break;
         case QD_ROUTER_CONNECTION:        break;
-//      case QD_ROUTER_TCP_CONNECTION:    break;
+        case QD_ROUTER_TCP_CONNECTION:    break;
         case QD_ROUTER_HTTP_REQUEST_INFO: break;
         case QD_ROUTER_ROUTER:            qdr_agent_forbidden(core, query, false); break;
         case QD_ROUTER_LINK:              break;
@@ -459,7 +459,7 @@ static void qdr_manage_delete_CT(qdr_core_t *core, qdr_action_t *action, bool di
         case QD_ROUTER_CONFIG_ADDRESS:    qdra_config_address_delete_CT(core, query, name, identity); break;
         case QD_ROUTER_CONFIG_AUTO_LINK:  qdra_config_auto_link_delete_CT(core, query, name, identity); break;
         case QD_ROUTER_CONNECTION:        qdr_agent_forbidden(core, query, false); break;
-//      case QD_ROUTER_TCP_CONNECTION:    break;
+        case QD_ROUTER_TCP_CONNECTION:    break;
         case QD_ROUTER_HTTP_REQUEST_INFO: break;
         case QD_ROUTER_ROUTER:            qdr_agent_forbidden(core, query, false); break;
         case QD_ROUTER_LINK:              break;
@@ -484,7 +484,7 @@ static void qdr_manage_update_CT(qdr_core_t *core, qdr_action_t *action, bool di
         case QD_ROUTER_CONFIG_ADDRESS:    break;
         case QD_ROUTER_CONFIG_AUTO_LINK:  break;
         case QD_ROUTER_CONNECTION:        qdra_connection_update_CT(core, name, identity, query, in_body); break;
-//      case QD_ROUTER_TCP_CONNECTION:    break;
+        case QD_ROUTER_TCP_CONNECTION:    break;
         case QD_ROUTER_HTTP_REQUEST_INFO: break;
         case QD_ROUTER_ROUTER:            break;
         case QD_ROUTER_LINK:              qdra_link_update_CT(core, name, identity, query, in_body); break;
@@ -512,7 +512,7 @@ static void qdrh_query_get_first_CT(qdr_core_t *core, qdr_action_t *action, bool
         case QD_ROUTER_CONFIG_AUTO_LINK:  qdra_config_auto_link_get_first_CT(core, query, offset); break;
         case QD_ROUTER_ROUTER:            qdra_router_get_first_CT(core, query, offset); break;
         case QD_ROUTER_CONNECTION:        qdra_connection_get_first_CT(core, query, offset); break;
-//      case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_first_CT(core, query, offset); break;
+        case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_first_CT(core, query, offset); break;
         case QD_ROUTER_HTTP_REQUEST_INFO: qdra_http_request_info_get_first_CT(core, query, offset); break;
         case QD_ROUTER_LINK:              qdra_link_get_first_CT(core, query, offset); break;
         case QD_ROUTER_ADDRESS:           qdra_address_get_first_CT(core, query, offset); break;
@@ -532,7 +532,7 @@ static void qdrh_query_get_next_CT(qdr_core_t *core, qdr_action_t *action, bool
         case QD_ROUTER_CONFIG_AUTO_LINK:  qdra_config_auto_link_get_next_CT(core, query); break;
         case QD_ROUTER_ROUTER:      qdra_router_get_next_CT(core, query); break;
         case QD_ROUTER_CONNECTION:        qdra_connection_get_next_CT(core, query); break;
-//      case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_next_CT(core, query); break;
+        case QD_ROUTER_TCP_CONNECTION:    qdra_tcp_connection_get_next_CT(core, query); break;
         case QD_ROUTER_HTTP_REQUEST_INFO: qdra_http_request_info_get_next_CT(core, query); break;
         case QD_ROUTER_LINK:              qdra_link_get_next_CT(core, query); break;
         case QD_ROUTER_ADDRESS:           qdra_address_get_next_CT(core, query); break;
diff --git a/src/router_core/management_agent.c b/src/router_core/management_agent.c
index dfcc3e67e..867025e4d 100644
--- a/src/router_core/management_agent.c
+++ b/src/router_core/management_agent.c
@@ -436,8 +436,8 @@ static bool qd_can_handle_request(qd_parsed_field_t           *properties_fld,
         *entity_type = QD_ROUTER_ROUTER;
     else if (qd_iterator_equal(qd_parse_raw(parsed_field), connection_entity_type))
         *entity_type = QD_ROUTER_CONNECTION;
-//  else if (qd_iterator_equal(qd_parse_raw(parsed_field), tcp_connection_entity_type))
-//      *entity_type = QD_ROUTER_TCP_CONNECTION;
+    else if (qd_iterator_equal(qd_parse_raw(parsed_field), tcp_connection_entity_type))
+        *entity_type = QD_ROUTER_TCP_CONNECTION;
     else if (qd_iterator_equal(qd_parse_raw(parsed_field), http_request_info_entity_type))
         *entity_type = QD_ROUTER_HTTP_REQUEST_INFO;
     else