diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index ff42f85156..b74ca47d95 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -11,6 +11,7 @@
         <key>Value</key>
         <integer>1</integer>
       </map>
+    <!-- .:FS:CR:. FIRE-9759 - Temporarily remove setting AvatarZOffset
     <key>AvatarZOffset</key>
         <map>
         <key>Comment</key>
@@ -22,6 +23,7 @@
         <key>Value</key>
             <real>0.0</real>
         </map>
+    -->
       <key>BusyResponseChanged</key>
         <map>
         <key>Comment</key>
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 562fed1439..825588b56d 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -890,7 +890,8 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged));
 // [SL:KB] - Patch: UI-DndButtonCommit | Checked: 2011-06-19 (Catznip-2.6.0c) | Added: Catznip-2.6.0c
 	gSavedSettings.getControl("DragAndDropCommitDelay")->getSignal()->connect(boost::bind(&handleSettingF32Change, _2, &DELAY_DRAG_HOVER_COMMIT));
-	gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here
+	// <FS:CR> FIRE-9759 - Temporarily remove AvatarZOffset since it's broken
+	//gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here
 	gSavedSettings.getControl("FSUseV1Menus")->getSignal()->connect(boost::bind(&show_v1_menus));	// V1 menu system	-WoLf
 	// <FS:Zi> Is done inside XUI now, using visibility_control
 	// gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2));
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 9017bfded2..ae1eb15c13 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -3482,6 +3482,9 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
 // [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
 F32 LLVOAvatarSelf::getAvatarOffset() /*const*/
 {
-	return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : RlvSettings::getAvatarOffsetZ();
+	// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
+	//return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : RlvSettings::getAvatarOffsetZ();
+	return LLAvatarAppearance::getAvatarOffset();
+	// </FS:CR>
 }
 // [/RLVa:KB]
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index a065dc3b80..1f65df74b5 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -78,7 +78,8 @@ template<typename T> inline T rlvGetPerUserSetting(const std::string& strSetting
 class RlvSettings
 {
 public:
-	static F32  getAvatarOffsetZ()				{ return rlvGetPerUserSetting<F32>(RLV_SETTING_AVATAROFFSET_Z, 0.0); }
+    // <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
+	//static F32  getAvatarOffsetZ()				{ return rlvGetPerUserSetting<F32>(RLV_SETTING_AVATAROFFSET_Z, 0.0); }
 	static bool getDebug()						{ return rlvGetSetting<bool>(RLV_SETTING_DEBUG, false); }
 	static bool getCanOOC()						{ return fCanOOC; }
 	static bool getForbidGiveToRLV()			{ return rlvGetSetting<bool>(RLV_SETTING_FORBIDGIVETORLV, true); }
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 5497077a3c..d116e241bb 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -295,7 +295,8 @@ enum ERlvAttachGroupType
 
 #define RLV_SETTING_MAIN				"RestrainedLove"
 #define RLV_SETTING_DEBUG				"RestrainedLoveDebug"
-#define RLV_SETTING_AVATAROFFSET_Z		"AvatarZOffset"
+// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
+//#define RLV_SETTING_AVATAROFFSET_Z		"AvatarZOffset"
 #define RLV_SETTING_CANOOC				"RestrainedLoveCanOOC"
 #define RLV_SETTING_FORBIDGIVETORLV		"RestrainedLoveForbidGiveToRLV"
 #define RLV_SETTING_NOSETENV			"RestrainedLoveNoSetEnv"
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index c605f85e67..fa3cd86bc5 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1611,7 +1611,8 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
 				{
 					F32 nValue = (rlvCmdOption.m_nPelvisToFoot - gAgentAvatarp->getPelvisToFoot()) * rlvCmdOption.m_nPelvisToFootDeltaMult;
 					nValue += rlvCmdOption.m_nPelvisToFootOffset;
-					gSavedPerAccountSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
+					// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
+					//gSavedPerAccountSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
 				}
 			}
 			break;
diff --git a/indra/newview/skins/default/xui/it/floater_quickprefs.xml b/indra/newview/skins/default/xui/it/floater_quickprefs.xml
index e6e78dffc3..6e010b6779 100644
--- a/indra/newview/skins/default/xui/it/floater_quickprefs.xml
+++ b/indra/newview/skins/default/xui/it/floater_quickprefs.xml
@@ -27,8 +27,7 @@
 		<text name="Tag Offset" tool_tip="Consente di modificare l'altezza dell'avatar senza modificare la shape. Default 0">
 			Altezza Tag:
 		</text>
-		<slider name="FSNameTagZOffsetCorrection"/>
-		<slider name="AvatarZOffset"/>		
+		<slider name="FSNameTagZOffsetCorrection"/>		
 		<text name="name_tags_textbox">
 			Tag Nome:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_quickprefs.xml b/indra/newview/skins/default/xui/ru/floater_quickprefs.xml
index c9ac41d14e..3a203f0e75 100644
--- a/indra/newview/skins/default/xui/ru/floater_quickprefs.xml
+++ b/indra/newview/skins/default/xui/ru/floater_quickprefs.xml
@@ -27,8 +27,7 @@
         <slider left_delta="87" name="RenderAvatarMaxVisible"/>		
         <text name="Height Offset" width="105" tool_tip="Позволяет изменять расстояние по вертикали от аватара, не меняя самой фигуры.">
             Выс.вмещения:
-        </text>
-        <slider left_delta="87" name="AvatarZOffset"/>		
+        </text>		
 		<text name="name_tags_textbox">
             Имена аватаров:
         </text>