diff --git a/docs/changes.txt b/docs/changes.txt
index 6d255dd98c..cefce2aeb3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -38,6 +38,10 @@ Changes in behaviour not resulting in compilation errors
   for getting the micro version. If you override GetToolkitVersion() you need
   to add this new third parameter.
 
+- wxWindow::CreateAccessible() doesn't return accessible object by default
+  anymore and GetOrCreateAccessible() may return NULL, indicating that native
+  system-provided accessibility should be used.
+
 Changes in behaviour which may result in build errors
 -----------------------------------------------------
 
diff --git a/include/wx/window.h b/include/wx/window.h
index ca168dd6fd..e65b5a6d96 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1449,7 +1449,7 @@ public:
     // ----------------------
 #if wxUSE_ACCESSIBILITY
     // Override to create a specific accessible object.
-    virtual wxAccessible* CreateAccessible();
+    virtual wxAccessible* CreateAccessible() { return NULL; }
 
     // Sets the accessible object.
     void SetAccessible(wxAccessible* accessible) ;
@@ -1457,7 +1457,8 @@ public:
     // Returns the accessible object.
     wxAccessible* GetAccessible() { return m_accessible; }
 
-    // Returns the accessible object, creating if necessary.
+    // Returns the accessible object, calling CreateAccessible if necessary.
+    // May return NULL, in which case system-provide accessible is used.
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 77323f2498..f9cb00a5db 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -3186,12 +3186,6 @@ wxAccessible* wxWindowBase::GetOrCreateAccessible()
     return m_accessible;
 }
 
-// Override to create a specific accessible object.
-wxAccessible* wxWindowBase::CreateAccessible()
-{
-    return new wxWindowAccessible((wxWindow*) this);
-}
-
 #endif
 
 // ----------------------------------------------------------------------------