diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 96bf1152..48f69e46 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -175,7 +175,6 @@ void on_connect(std::shared_ptr<Client> c) {
       send_server_init(c, 0);
       break;
 
-    case ServerBehavior::DATA_SERVER_BB:
     case ServerBehavior::LOBBY_SERVER:
       send_server_init(c, 0);
       break;
@@ -257,10 +256,9 @@ static void send_main_menu(shared_ptr<Client> c) {
 }
 
 void on_login_complete(shared_ptr<Client> c) {
-  // On the BB data server, this function is called only on the last connection
-  // (when we should send the ship select menu).
-  if ((c->server_behavior == ServerBehavior::LOGIN_SERVER) ||
-      (c->server_behavior == ServerBehavior::DATA_SERVER_BB)) {
+  // On BB, this function is called when the data server phase is done (and we
+  // should send the ship select menu), so we don't need to check for it here.
+  if (c->server_behavior == ServerBehavior::LOGIN_SERVER) {
     auto s = c->require_server_state();
 
     // On the login server, send the events/songs, ep3 updates, and the main
diff --git a/src/Version.cc b/src/Version.cc
index 22a0c4d6..2dbcfb9a 100644
--- a/src/Version.cc
+++ b/src/Version.cc
@@ -163,8 +163,6 @@ const char* name_for_enum<ServerBehavior>(ServerBehavior behavior) {
       return "login_server";
     case ServerBehavior::LOBBY_SERVER:
       return "lobby_server";
-    case ServerBehavior::DATA_SERVER_BB:
-      return "data_server_bb";
     case ServerBehavior::PATCH_SERVER_PC:
       return "patch_server_pc";
     case ServerBehavior::PATCH_SERVER_BB:
@@ -179,12 +177,10 @@ template <>
 ServerBehavior enum_for_name<ServerBehavior>(const char* name) {
   if (!strcasecmp(name, "pc_console_detect")) {
     return ServerBehavior::PC_CONSOLE_DETECT;
-  } else if (!strcasecmp(name, "login_server") || !strcasecmp(name, "login")) {
+  } else if (!strcasecmp(name, "login_server") || !strcasecmp(name, "login") || !strcasecmp(name, "data_server_bb")) {
     return ServerBehavior::LOGIN_SERVER;
   } else if (!strcasecmp(name, "lobby_server") || !strcasecmp(name, "lobby")) {
     return ServerBehavior::LOBBY_SERVER;
-  } else if (!strcasecmp(name, "data_server_bb") || !strcasecmp(name, "data_server") || !strcasecmp(name, "data")) {
-    return ServerBehavior::DATA_SERVER_BB;
   } else if (!strcasecmp(name, "patch_server_pc") || !strcasecmp(name, "patch_pc")) {
     return ServerBehavior::PATCH_SERVER_PC;
   } else if (!strcasecmp(name, "patch_server_bb") || !strcasecmp(name, "patch_bb")) {
diff --git a/src/Version.hh b/src/Version.hh
index f2bc0b3c..a23c6085 100644
--- a/src/Version.hh
+++ b/src/Version.hh
@@ -104,7 +104,6 @@ enum class ServerBehavior {
   PC_CONSOLE_DETECT = 0,
   LOGIN_SERVER,
   LOBBY_SERVER,
-  DATA_SERVER_BB,
   PATCH_SERVER_PC,
   PATCH_SERVER_BB,
   PROXY_SERVER,
diff --git a/system/config.example.json b/system/config.example.json
index c6af4123..8ab49315 100644
--- a/system/config.example.json
+++ b/system/config.example.json
@@ -73,7 +73,7 @@
     "pc":            [9300,  "pc",    "login_server"],
     "pc-patch":      [10000, "patch", "patch_server_pc"],
     "bb-patch":      [11000, "patch", "patch_server_bb"],
-    "bb-init":       [12000, "bb",    "data_server_bb"],
+    "bb-init":       [12000, "bb",    "login_server"],
 
     // PSO Xbox tunnels its connections through the Xbox Live service (or, in
     // modern times, Insignia), and that service determines which port the
@@ -83,7 +83,7 @@
 
     // Schthack PSOBB uses these ports.
     // "bb-patch2":     [10500, "patch", "patch_server_bb"],
-    // "bb-init2":      [13000, "bb",    "data_server_bb"],
+    // "bb-init2":      [13000, "bb",    "login_server"],
 
     // Ephinea PSOBB uses these ports. Note that 13000 is also used by Schthack
     // PSOBB, but not for the patch server; this means you unfortunately can't
@@ -91,7 +91,7 @@
     // may be fixed in the future using a similar technique as the
     // pc_console_detect behavior, but this isn't implemented yet.
     // "bb-patch3":     [13000, "patch", "patch_server_bb"],
-    // "bb-init3":      [14000, "bb",    "data_server_bb"],
+    // "bb-init3":      [14000, "bb",    "login_server"],
 
     // newserv uses these ports, but there is no external reason that these
     // numbers were chosen. You can change the port numbers here without any
@@ -124,8 +124,8 @@
     "gc-proxy":      [5122,  "gc",    "proxy_server"],
     "xb-proxy":      [5123,  "xb",    "proxy_server"],
     "bb-proxy":      [5124,  "bb",    "proxy_server"],
-    "bb-data1":      [12004, "bb",    "data_server_bb"],
-    "bb-data2":      [12005, "bb",    "data_server_bb"],
+    "bb-data1":      [12004, "bb",    "login_server"],
+    "bb-data2":      [12005, "bb",    "login_server"],
   },
 
   // Where to listen for IP stack clients. This exists to interface with PSO GC
diff --git a/tests/config.json b/tests/config.json
index ab36e551..84a607e0 100644
--- a/tests/config.json
+++ b/tests/config.json
@@ -43,10 +43,10 @@
     "xb":            [9500,  "xb",    "login_server"],
     "pc-patch":      [10000, "patch", "patch_server_pc"],
     "bb-patch":      [11000, "patch", "patch_server_bb"],
-    "bb-init":       [12000, "bb",    "data_server_bb"],
+    "bb-init":       [12000, "bb",    "login_server"],
     "bb-patch2":     [10500, "patch", "patch_server_bb"],
     "bb-proxy2":     [9932,  "bb",    "proxy_server"],
-    "bb-patch3":     [13000, "bb",    "data_server_bb"],
+    "bb-patch3":     [13000, "bb",    "login_server"],
     "console-login": [5100,  "gc",    "login_server"],
     "pc-login":      [5101,  "pc",    "login_server"],
     "xb-login":      [5102,  "xb",    "login_server"],
@@ -59,8 +59,8 @@
     "xb-proxy":      [5113,  "xb",    "proxy_server"],
     "pc-proxy":      [5121,  "pc",    "proxy_server"],
     "bb-proxy":      [5122,  "bb",    "proxy_server"],
-    "bb-data1":      [12004, "bb",    "data_server_bb"],
-    "bb-data2":      [12005, "bb",    "data_server_bb"],
+    "bb-data1":      [12004, "bb",    "login_server"],
+    "bb-data2":      [12005, "bb",    "login_server"],
   },
 
   "ProxyDestinations-GC": {