diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index 5ee90213f6..727b476ace 100644
--- a/src/univ/framuniv.cpp
+++ b/src/univ/framuniv.cpp
@@ -195,8 +195,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     }
 #endif // wxUSE_MENUS
 
-   // This is done in wxFrameBase already
-#if 0 // wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR
     if ( m_frameToolBar )
     {
         if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL )
diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index 0731cd04fd..83d4ad199a 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -264,8 +264,10 @@ bool wxToolBar::Realize()
     {
         SetSize(sz.x, m_maxHeight);
     }
-    
-    SetSize( x+16, m_defaultHeight + 14 );
+
+    // Commenting out Robert's fix since the above should be
+    // more general
+    //    SetSize( x+16, m_defaultHeight + 14 );
     
     return TRUE;
 }