diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ecd62cadf875404bca7f9233dac1a9747766c83a..573cca248cb40e0847f4a2ea00bb6bc64fbba708 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4562,11 +4562,6 @@ void LLAppViewer::loadKeyBindings()
 			LLKeyboard::keyFromString(key_string, &key);
 		}
 
-		value = gSavedSettings.getBOOL("PushToTalkToggle");
-		std::string control_name = value ? "toggle_voice" : "voice_follow_key";
-		third_person_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
-		sitting_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
-
 		if (third_person_view.hasUnsavedChanges())
 		{
 			// calls loadBindingsXML()
@@ -4578,25 +4573,6 @@ void LLAppViewer::loadKeyBindings()
 			// calls loadBindingsXML()
 			sitting_view.saveToSettings();
 		}
-
-		// in case of voice we need to repeat this in other modes
-
-		for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i)
-		{
-			// edit and first person modes; MODE_SAVED_SETTINGS not in use at the moment
-			if (i != LLKeyConflictHandler::MODE_THIRD_PERSON && i != LLKeyConflictHandler::MODE_SITTING)
-			{
-				LLKeyConflictHandler handler((LLKeyConflictHandler::ESourceMode)i);
-
-				handler.registerControl(control_name, 0, mouse, key, MASK_NONE, true);
-
-				if (handler.hasUnsavedChanges())
-				{
-					// calls loadBindingsXML()
-					handler.saveToSettings();
-				}
-			}
-		}
 	}
 	// since something might have gone wrong or there might have been nothing to save
 	// (and because otherwise following code will have to be encased in else{}),
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
index b6107eeedf13ceff9fcdd15aebe4d63883d8bd93..52e14d48f7f87117b0e87adb6f7000870251baa8 100644
--- a/indra/newview/llkeyconflict.cpp
+++ b/indra/newview/llkeyconflict.cpp
@@ -644,7 +644,6 @@ void LLKeyConflictHandler::saveToSettings(bool temporary)
             data = getControl("voice_follow_key", 0);
         }
 
-        gSavedSettings.setBOOL("PushToTalkToggle", can_toggle);
         if (data.isEmpty())
         {
             // legacy viewer has a bug that might crash it if NONE value is assigned.