Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2094)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2095)
@@ -56,4 +56,8 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2127">#2127</a>] Changed floating dialogs to use
 			fixed positioning so that they are no longer affected by scrolling.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2018">#2018</a>] Reversed the fix for
+			<a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a> which broke FCKeditorAPI's cleanup
+			logic. A new configuration directive <strong>MsWebBrowserControlCompat</strong> has been added
+			for those who wish to force the #183 fix to be enabled.</li> 
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/classes/fckiecleanup.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckiecleanup.js	(revision 2094)
+++ /FCKeditor/trunk/editor/_source/classes/fckiecleanup.js	(revision 2095)
@@ -44,5 +44,5 @@
 function FCKIECleanup_Cleanup()
 {
-	if ( !this._FCKCleanupObj || !window.FCKUnloadFlag )
+	if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) )
 		return ;
 
Index: /FCKeditor/trunk/editor/_source/fckeditorapi.js
===================================================================
--- /FCKeditor/trunk/editor/_source/fckeditorapi.js	(revision 2094)
+++ /FCKeditor/trunk/editor/_source/fckeditorapi.js	(revision 2095)
@@ -165,5 +165,6 @@
 function FCKeditorAPI_Cleanup()
 {
-	if ( ! window.FCKUnloadFlag )
+	if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat 
+			&& !window.FCKUnloadFlag )
 		return ;
 	delete FCKeditorAPI.Instances[ FCK.Name ] ;
@@ -171,5 +172,6 @@
 function FCKeditorAPI_ConfirmCleanup()
 {
-	window.FCKUnloadFlag = true ;
+	if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat )
+		window.FCKUnloadFlag = true ;
 }
 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js	(revision 2094)
+++ /FCKeditor/trunk/fckconfig.js	(revision 2095)
@@ -315,2 +315,4 @@
 FCKConfig.BackgroundBlockerColor = '#ffffff' ;
 FCKConfig.BackgroundBlockerOpacity = 0.50 ;
+
+FCKConfig.MsWebBrowserControlCompat = false ;