diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 687dd661062..17b9049ed0e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "ca3cef257ae1d19f25cd4b973f7ba2a713b8a7c2", 
+    "revision": "94340fb19f685f3cd6e5fa990281557ba810a10e", 
     "repo_path": "/integration/gaia-central"
 }
diff --git a/toolkit/webapps/WebappOSUtils.jsm b/toolkit/webapps/WebappOSUtils.jsm
index 22338431e59..4fd020089be 100644
--- a/toolkit/webapps/WebappOSUtils.jsm
+++ b/toolkit/webapps/WebappOSUtils.jsm
@@ -134,28 +134,37 @@ this.WebappOSUtils = {
   },
 
   getInstallPath: function(aApp) {
+    if (Services.appinfo.ID == "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}") {
+      // B2G
+      return aApp.basePath + "/" + aApp.id;
+    } else if (Services.appinfo.ID == "{aa3c5121-dab2-40e2-81ca-7ea25febc110}") {
+      // Android
+      return aApp.basePath + "/" + aApp.id;
+    } else if (Services.appinfo.ID == "{99bceaaa-e3c6-48c1-b981-ef9b46b67d60}") {
+      // Metro
+      return null;
+    } else {
+      // Firefox, the Webapp Runtime and other Desktop products share the same
+      // directory naming scheme.
 #ifdef XP_WIN
-    let execFile = this.getLaunchTarget(aApp);
-    if (!execFile) {
-      return null;
-    }
+      let execFile = this.getLaunchTarget(aApp);
+      if (!execFile) {
+        return null;
+      }
 
-    return execFile.parent.path;
+      return execFile.parent.path;
 #elifdef XP_MACOSX
-    let [ bundleID, path ] = this.getLaunchTarget(aApp);
-    return path;
-#elifdef MOZ_B2G
-    return aApp.basePath + "/" + aApp.id;
-#elifdef MOZ_FENNEC
-    return aApp.basePath + "/" + aApp.id;
+      let [ bundleID, path ] = this.getLaunchTarget(aApp);
+      return path;
 #elifdef XP_UNIX
-    let execFile = this.getLaunchTarget(aApp);
-    if (!execFile) {
-      return null;
-    }
+      let execFile = this.getLaunchTarget(aApp);
+      if (!execFile) {
+        return null;
+      }
 
-    return execFile.parent.path;
+      return execFile.parent.path;
 #endif
+    }
   },
 
   launch: function(aApp) {