Revert "Multiple Hubs Support"

This reverts commit f7bd3dc98956a0dfbd9b2b50cbea244ab9bf6372.
Revert "Revert "Multiple Hubs Support""

This reverts commit bfa0e3462ef795f712e43b56a96243a5f9278e20.