diff --git a/zerver/data_import/hipchat.py b/zerver/data_import/hipchat.py
index fdb32c1b59..65bf936973 100755
--- a/zerver/data_import/hipchat.py
+++ b/zerver/data_import/hipchat.py
@@ -32,7 +32,7 @@ from zerver.data_import.import_util import (
     build_stream,
     build_personal_subscriptions,
     build_public_stream_subscriptions,
-    build_private_stream_subscriptions,
+    build_stream_subscriptions,
     build_user_message,
     build_user_profile,
     build_zerver_realm,
@@ -812,29 +812,28 @@ def do_convert_data(input_tar_file: str,
     )
     realm['zerver_recipient'] = zerver_recipient
 
-    if slim_mode:
-        public_stream_subscriptions = []  # type: List[ZerverFieldsT]
-    else:
-        public_stream_subscriptions = build_public_stream_subscriptions(
-            zerver_userprofile=normal_users,
-            zerver_recipient=zerver_recipient,
-            zerver_stream=zerver_stream,
-        )
+    if True:
+        if slim_mode:
+            public_stream_subscriptions = []  # type: List[ZerverFieldsT]
+        else:
+            public_stream_subscriptions = build_public_stream_subscriptions(
+                zerver_userprofile=normal_users,
+                zerver_recipient=zerver_recipient,
+                zerver_stream=zerver_stream,
+            )
 
-    private_stream_subscriptions = build_private_stream_subscriptions(
-        get_users=subscriber_handler.get_users,
-        zerver_recipient=zerver_recipient,
-        zerver_stream=zerver_stream,
-    )
+        private_stream_subscriptions = build_stream_subscriptions(
+            get_users=subscriber_handler.get_users,
+            zerver_recipient=zerver_recipient,
+            zerver_stream=[stream_dict for stream_dict in zerver_stream
+                           if stream_dict['invite_only']],
+        )
+        stream_subscriptions = public_stream_subscriptions + private_stream_subscriptions
 
     personal_subscriptions = build_personal_subscriptions(
         zerver_recipient=zerver_recipient,
     )
-
-    zerver_subscription = \
-        public_stream_subscriptions + \
-        personal_subscriptions + \
-        private_stream_subscriptions
+    zerver_subscription = personal_subscriptions + stream_subscriptions
 
     realm['zerver_subscription'] = zerver_subscription
 
diff --git a/zerver/data_import/import_util.py b/zerver/data_import/import_util.py
index d45a1277fa..d84311697d 100644
--- a/zerver/data_import/import_util.py
+++ b/zerver/data_import/import_util.py
@@ -141,18 +141,14 @@ def build_public_stream_subscriptions(
 
     return subscriptions
 
-def build_private_stream_subscriptions(
+def build_stream_subscriptions(
         get_users: Callable[..., Set[int]],
         zerver_recipient: List[ZerverFieldsT],
         zerver_stream: List[ZerverFieldsT]) -> List[ZerverFieldsT]:
 
     subscriptions = []  # type: List[ZerverFieldsT]
 
-    stream_ids = {
-        stream['id']
-        for stream in zerver_stream
-        if stream['invite_only']
-    }
+    stream_ids = {stream['id'] for stream in zerver_stream}
 
     recipient_map = {
         recipient['id']: recipient['type_id']  # recipient_id -> stream_id