diff --git a/mozilla/camino/resources/application/all-camino.js b/mozilla/camino/resources/application/all-camino.js
index 74c7fddcb90..dba5eb41fbe 100644
--- a/mozilla/camino/resources/application/all-camino.js
+++ b/mozilla/camino/resources/application/all-camino.js
@@ -78,8 +78,6 @@ pref("browser.download.progressDnldDialog.keepAlive", true);
 // Download removing policy
 pref("browser.download.downloadRemoveAction", 0);
 
-pref("chimera.enable_rendezvous", true);
-
 // set typeahead find to search all text by default, but not invoke
 // unless you type '/'
 pref("accessibility.typeaheadfind.linksonly", false);
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib
index 814a8b7b69c..6d5cba05c16 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/mozilla/camino/src/application/MainController.h b/mozilla/camino/src/application/MainController.h
index 7d8e562cf33..0d03a6a40c2 100644
--- a/mozilla/camino/src/application/MainController.h
+++ b/mozilla/camino/src/application/MainController.h
@@ -71,7 +71,6 @@ typedef enum EBookmarkOpenBehavior
     IBOutlet NSMenuItem*    mCloseWindowMenuItem;
     IBOutlet NSMenuItem*    mCloseTabMenuItem;
 
-    IBOutlet NSMenu*        mGoMenu;
     IBOutlet BookmarkMenu*  mBookmarksMenu;
     IBOutlet BookmarkMenu*  mDockMenu;
     IBOutlet NSMenu*        mServersSubmenu;
diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm
index 02c04b90ce8..04a01afd49d 100644
--- a/mozilla/camino/src/application/MainController.mm
+++ b/mozilla/camino/src/application/MainController.mm
@@ -392,22 +392,19 @@ const int kReuseWindowOnAE = 2;
 
 - (void)setupRendezvous // aka "Bonjour"
 {
-  BOOL doingRendezvous = NO;
-
-  if ([[PreferenceManager sharedInstance] getBooleanPref:"chimera.enable_rendezvous" withSuccess:NULL]) {
-    NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
-    [notificationCenter addObserver:self selector:@selector(availableServicesChanged:) name:NetworkServicesAvailableServicesChanged object:nil];
-    [notificationCenter addObserver:self selector:@selector(serviceResolved:) name:NetworkServicesResolutionSuccess object:nil];
-    [notificationCenter addObserver:self selector:@selector(serviceResolutionFailed:) name:NetworkServicesResolutionFailure object:nil];
-    doingRendezvous = YES;
-  }
-
-  if (!doingRendezvous) {
+  if ([[PreferenceManager sharedInstance] getBooleanPref:"camino.disable_bonjour" withSuccess:NULL]) {
     // remove rendezvous items
     int itemIndex;
-    while ((itemIndex = [mGoMenu indexOfItemWithTag:kRendezvousRelatedItemTag]) != -1)
-      [mGoMenu removeItemAtIndex:itemIndex];
+    while ((itemIndex = [mBookmarksMenu indexOfItemWithTag:kRendezvousRelatedItemTag]) != -1)
+      [mBookmarksMenu removeItemAtIndex:itemIndex];
+
+    return;
   }
+
+  NSNotificationCenter* notificationCenter = [NSNotificationCenter defaultCenter];
+  [notificationCenter addObserver:self selector:@selector(availableServicesChanged:) name:NetworkServicesAvailableServicesChanged object:nil];
+  [notificationCenter addObserver:self selector:@selector(serviceResolved:) name:NetworkServicesResolutionSuccess object:nil];
+  [notificationCenter addObserver:self selector:@selector(serviceResolutionFailed:) name:NetworkServicesResolutionFailure object:nil];
 }
 
 - (void)checkDefaultBrowser