diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index 628a0d1ef30..d70814c484c 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -181,6 +181,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
       }
     }
     break;
+#ifndef tague_keyboard_patch
   case NS_KEY_DOWN:
     ret = DispatchKeyPressEvent(aPresContext, (nsKeyEvent*)aEvent, aStatus);
     if (nsEventStatus_eConsumeNoDefault != aStatus) {
@@ -231,6 +232,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
       }
     }
     break;
+#endif
   }
   return ret;
 }
diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp
index a5ceb5edf55..30d00e2a0df 100644
--- a/mozilla/editor/base/nsEditorEventListeners.cpp
+++ b/mozilla/editor/base/nsEditorEventListeners.cpp
@@ -105,7 +105,7 @@ nsTextEditorKeyListener::HandleEvent(nsIDOMEvent* aEvent)
   return NS_OK;
 }
 
-#ifdef DEBUG_TAGUE
+#ifdef tague_keyboard_patch
 nsresult
 nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent)
 {
@@ -265,7 +265,7 @@ nsTextEditorKeyListener::KeyUp(nsIDOMEvent* aKeyEvent)
 }
 
 
-#ifdef DEBUG_TAGUE
+#ifdef tague_keyboard_patch
 nsresult
 nsTextEditorKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
 {
diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
index a5ceb5edf55..30d00e2a0df 100644
--- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -105,7 +105,7 @@ nsTextEditorKeyListener::HandleEvent(nsIDOMEvent* aEvent)
   return NS_OK;
 }
 
-#ifdef DEBUG_TAGUE
+#ifdef tague_keyboard_patch
 nsresult
 nsTextEditorKeyListener::KeyDown(nsIDOMEvent* aKeyEvent)
 {
@@ -265,7 +265,7 @@ nsTextEditorKeyListener::KeyUp(nsIDOMEvent* aKeyEvent)
 }
 
 
-#ifdef DEBUG_TAGUE
+#ifdef tague_keyboard_patch
 nsresult
 nsTextEditorKeyListener::KeyPress(nsIDOMEvent* aKeyEvent)
 {
diff --git a/mozilla/layout/events/src/nsEventStateManager.cpp b/mozilla/layout/events/src/nsEventStateManager.cpp
index 628a0d1ef30..d70814c484c 100644
--- a/mozilla/layout/events/src/nsEventStateManager.cpp
+++ b/mozilla/layout/events/src/nsEventStateManager.cpp
@@ -181,6 +181,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
       }
     }
     break;
+#ifndef tague_keyboard_patch
   case NS_KEY_DOWN:
     ret = DispatchKeyPressEvent(aPresContext, (nsKeyEvent*)aEvent, aStatus);
     if (nsEventStatus_eConsumeNoDefault != aStatus) {
@@ -231,6 +232,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
       }
     }
     break;
+#endif
   }
   return ret;
 }
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index c61ade2caae..22bc80794a6 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -118,7 +118,7 @@ nsWindow::nsWindow() : nsBaseWidget()
 	mIMECompositionStringSize = 0;
 	mIMECompositionStringSize = 0;
 	mIMECompositionUniString = NULL;
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
 	mHaveDBCSLeadByte = false;
 	mDBCSLeadByte = '\0';
 #endif
@@ -1924,7 +1924,7 @@ ULONG nsWindow::IsSpecialChar(UINT aVirtualKeyCode, WORD *aAsciiKey)
     case VK_F10:   
     case VK_F11:   
     case VK_F12: 
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
 	case VK_RETURN:
 	case VK_BACK:
 #endif
@@ -2089,7 +2089,7 @@ BOOL nsWindow::OnKeyUp( UINT aVirtualKeyCode, UINT aScanCode)
 //
 //
 //-------------------------------------------------------------------------
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
 BOOL nsWindow::OnChar( UINT aVirtualKeyCode, bool isMultiByte )
 {
   wchar_t	uniChar;
@@ -2252,7 +2252,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
         case WM_PAINT:
             result = OnPaint();
             break;
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
 		case WM_SYSCHAR:
 		case WM_CHAR: 
 			{
diff --git a/mozilla/widget/src/windows/nsWindow.h b/mozilla/widget/src/windows/nsWindow.h
index 7966d17f82f..557d8ecd63a 100644
--- a/mozilla/widget/src/windows/nsWindow.h
+++ b/mozilla/widget/src/windows/nsWindow.h
@@ -173,7 +173,7 @@ protected:
     virtual PRBool          OnPaint();
     virtual PRBool          OnResize(nsRect &aWindowRect);
 
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
     BOOL                    OnChar(UINT aVirtualKeyCode, bool isMultibyte);
 #else
    BOOL                    OnChar(UINT aVirtualKeyCode);
@@ -242,7 +242,7 @@ protected:
 	PRUnichar*	mIMECompositionUniString;
 	PRInt32		mIMECompositionStringLength;
 	PRInt32		mIMECompositionStringSize;
-#ifdef DEBUG_tague
+#ifdef tague_keyboard_patch
 	BOOL		mHaveDBCSLeadByte;
 	unsigned char mDBCSLeadByte;
 #endif