diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 6e94f95a0..176d067a2 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -129,7 +129,9 @@
         <category android:name="android.intent.category.BROWSABLE" />
 
         <data android:scheme="http"
-              android:host="@string/invite_host" android:pathPrefix="/and/" />
+              android:host="@string/invite_host"
+              android:pathPrefix="@string/invite_prefix"
+              />
       </intent-filter>
     </activity>
 
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index e8928e6a9..516e9aa13 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -102,10 +102,9 @@
   <!-- other -->
   <string name="default_host">eehouse.org</string>
 
-  <!-- <string name="default_host">10.0.2.2</string> -->
   <string name="invite_host">eehouse.org</string>
+  <string name="invite_prefix">/and/</string>
   <string name="dict_url">http://eehouse.org/and_wordlists</string>
-  <string name="game_url_pathf">//%1$s/and</string>
   <string name="expl_update_url">Update checks URL</string>
   <string name="default_update_url">http://eehouse.org/xw4/info.py</string>
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
index f25453dda..0fa720132 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri.Builder;
 import android.net.Uri;
 import android.os.Bundle;
 import java.net.URLEncoder;
@@ -99,14 +98,15 @@ public class NetLaunchInfo {
                                      String inviteID, int lang, 
                                      String dict, int nPlayersT )
     {
-        String host = context.getString( R.string.invite_host );
-        Builder ub = new Builder();
-        ub.scheme( "http" );
-        ub.path( context.getString( R.string.game_url_pathf, host ) );
-        ub.appendQueryParameter( "lang", String.format("%d", lang ) );
-        ub.appendQueryParameter( "np", String.format( "%d", nPlayersT ) );
-        ub.appendQueryParameter( "room", room );
-        ub.appendQueryParameter( "id", inviteID );
+        Uri.Builder ub = new Uri.Builder()
+            .scheme( "http" )
+            .path( String.format( "//%s%s", 
+                                  context.getString(R.string.invite_host),
+                                  context.getString(R.string.invite_prefix) ) )
+            .appendQueryParameter( "lang", String.format("%d", lang ) )
+            .appendQueryParameter( "np", String.format( "%d", nPlayersT ) )
+            .appendQueryParameter( "room", room )
+            .appendQueryParameter( "id", inviteID );
         if ( null != dict ) {
             ub.appendQueryParameter( "wl", dict );
         }