diff --git a/src/designer/components/formeditor/formwindowmanager.cpp b/src/designer/components/formeditor/formwindowmanager.cpp
index a5c0c1a83..3be952da9 100644
--- a/src/designer/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/components/formeditor/formwindowmanager.cpp
@@ -918,7 +918,6 @@ void FormWindowManager::slotUpdateActions()
 QDesignerFormWindowInterface *FormWindowManager::createFormWindow(QWidget *parentWidget, Qt::WindowFlags flags)
 {
     FormWindow *formWindow = new FormWindow(qobject_cast<FormEditor*>(core()), parentWidget, flags);
-    formWindow->setProperty(WidgetFactory::disableStyleCustomPaintingPropertyC, QVariant(true));
     addFormWindow(formWindow);
     return formWindow;
 }
diff --git a/src/designer/shared/previewmanager.cpp b/src/designer/shared/previewmanager.cpp
index ead20fa9c..9158f0fa7 100644
--- a/src/designer/shared/previewmanager.cpp
+++ b/src/designer/shared/previewmanager.cpp
@@ -363,11 +363,9 @@ QWidget *PreviewManager::createPreview(const QDesignerFormWindowInterface *fw,
         formWidget->setAttribute(Qt::WA_DeleteOnClose, true);
         connect(formWidget, SIGNAL(destroyed()), zw, SLOT(close()));
         zw->setZoom(initialZoom);
-        zw->setProperty(WidgetFactory::disableStyleCustomPaintingPropertyC, QVariant(true));
         return zw;
     }
     formWidget->setParent(fw->window(), Qt::Dialog);
-    formWidget->setProperty(WidgetFactory::disableStyleCustomPaintingPropertyC, QVariant(true));
     return formWidget;
 }
 
diff --git a/src/designer/shared/widgetfactory.cpp b/src/designer/shared/widgetfactory.cpp
index f755454d6..a71b210f0 100644
--- a/src/designer/shared/widgetfactory.cpp
+++ b/src/designer/shared/widgetfactory.cpp
@@ -169,7 +169,6 @@ WidgetFactory::Strings::Strings() :
 // ---------------- WidgetFactory
 QPointer<QWidget> *WidgetFactory::m_lastPassiveInteractor = new QPointer<QWidget>();
 bool WidgetFactory::m_lastWasAPassiveInteractor = false;
-const char *WidgetFactory::disableStyleCustomPaintingPropertyC = "_q_custom_style_disabled";
 
 WidgetFactory::WidgetFactory(QDesignerFormEditorInterface *core, QObject *parent)
     : QDesignerWidgetFactoryInterface(parent),
@@ -557,16 +556,6 @@ void WidgetFactory::initializeCommon(QWidget *widget) const
     // Apply style
     if (m_currentStyle)
         widget->setStyle(m_currentStyle);
-    // Prevent the wizard from emulating the Windows Vista Theme.
-    // This theme (in both Aero and Basic mode) is tricky to
-    // emulate properly in designer due to 1) the manipulation of the non-client area of
-    // the top-level window, and 2) the upper-right location of the Back button.
-    // The wizard falls back to QWizard::ModernStyle whenever the Vista theme
-    // would normally apply.
-    if (QWizard *wizard = qobject_cast<QWizard *>(widget)) {
-        wizard->setProperty("_q_wizard_vista_off", QVariant(true));
-        return;
-    }
 }
 
 // Necessary initializations for preview objects
diff --git a/src/designer/shared/widgetfactory_p.h b/src/designer/shared/widgetfactory_p.h
index a433357b6..a4a52f535 100644
--- a/src/designer/shared/widgetfactory_p.h
+++ b/src/designer/shared/widgetfactory_p.h
@@ -102,10 +102,6 @@ public:
     // Return whether object was created by the factory for the form editor.
     static bool isFormEditorObject(const QObject *o);
 
-    // Boolean dynamic property to set on widgets to prevent custom
-    // styles from interfering
-    static const char *disableStyleCustomPaintingPropertyC;
-
 public slots:
     void loadPlugins();