               [:p "Bitbucket is not connected to your account yet. To connect it, click the button below:"]
               [:a.btn.btn-primary {:href (bitbucket/auth-url)
                                    :on-click #((om/get-shared owner :track-event) {:event-type :authorize-vcs-clicked
-                                                                                   :properties {:vcs-type vcs-type}})}
+                                                                                   :properties {:vcs-type selected-vcs-type}})}
                "Authorize with Bitbucket"]])
            [:ul.organizations
-            ;; here we display you, then all of your organizations, then all of the owners of
-            ;; repos that aren't organizations and aren't you. We do it this way because the
-            ;; organizations route is much faster than the repos route. We show them
-            ;; in this order (rather than e.g. putting the whole thing into a set)
-            ;; so that new ones don't jump up in the middle as they're loaded.
-            (let [user-org-keys (->> user
-                                     :organizations
-                                     (map (juxt :vcs_type :login))
-                                     set)
-                  user-org? (comp user-org-keys (juxt :vcs_type :login))
-                  all-orgs (concat (sort-by :org (:organizations user))
-                                   (->> repos
-                                        (map (fn [{:keys [owner vcs_type]}] (assoc owner :vcs_type vcs-type)))
-                                        (remove user-org?)
-                                        distinct))]
-              (->> all-orgs
-                   (filter (partial select-vcs-type vcs-type))
-                   (map (fn [org] (organization org selected-org owner)))))]
-           (when (get-in user [:repos-loading (keyword vcs-type)])
+            (->> orgs
+                 (filter (partial select-vcs-type selected-vcs-type))
+                 (map (fn [org] (organization org selected-org owner))))]
+           (when (get-in user [:repos-loading (keyword selected-vcs-type)])
              [:div.orgs-loading
               [:div.loading-spinner common/spinner]])]])))))
 

                [:p "GitHub is not connected to your account yet. To connect it, click the button below:"]
                [:a.btn.btn-primary {:href (gh-utils/auth-url)
                                     :on-click #((om/get-shared owner :track-event) {:event-type :authorize-vcs-clicked
                                                                                     :properties {:vcs-type vcs-type}})}
                 "Authorize with GitHub"]]))
           (when (and bitbucket-active?
                      (not bitbucket-authorized?))

                                         {:name "bitbucket"
                                          :icon (html [:i.fa.fa-bitbucket])
                                          :label "Bitbucket"}]
                                  :selected-tab-name selected-vcs-type
                                  :on-tab-click #(navigate! owner (routes/v1-add-projects-path {:_fragment %}))})
          [:div.organizations.card
           (when github-active?
