Index: WikiEditor/WikiEditor.php
===================================================================
--- WikiEditor/WikiEditor.php	(revision 112930)
+++ WikiEditor/WikiEditor.php	(working copy)
@@ -20,9 +20,9 @@
 
 	/* Textarea / i-frame compatible (OK to deploy) */
 
-	'toolbar' => array( 'global' => false, 'user' => true ),
+	'toolbar' => array( 'global' => true, 'user' => false ),
 	// Provides interactive tools
-	'dialogs' => array( 'global' => false, 'user' => true ),
+	'dialogs' => array( 'global' => true, 'user' => false ),
 	// Hide signature button from main namespace
 	'hidesig' => array( 'global' => true, 'user' => false ),
 
Index: WikiEditor/WikiEditor.hooks.php
===================================================================
--- WikiEditor/WikiEditor.hooks.php	(revision 112930)
+++ WikiEditor/WikiEditor.hooks.php	(working copy)
@@ -15,14 +15,6 @@
 		/* Beta Features */
 
 		'toolbar' => array(
-			'preferences' => array(
-				// Ideally this key would be 'wikieditor-toolbar'
-				'usebetatoolbar' => array(
-					'type' => 'toggle',
-					'label-message' => 'wikieditor-toolbar-preference',
-					'section' => 'editing/beta',
-				),
-			),
 			'requirements' => array(
 				'usebetatoolbar' => true,
 			),
@@ -34,14 +26,6 @@
 			),
 		),
 		'dialogs' => array(
-			'preferences' => array(
-				// Ideally this key would be 'wikieditor-toolbar-dialogs'
-				'usebetatoolbar-cgd' => array(
-					'type' => 'toggle',
-					'label-message' => 'wikieditor-toolbar-dialogs-preference',
-					'section' => 'editing/beta',
-				),
-			),
 			'requirements' => array(
 				'usebetatoolbar-cgd' => true,
 				'usebetatoolbar' => true,