diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index c8a20c9d978cc5b92e0fcf16be6e5ae0c4338772..2751631a59b3919601d9a7816f5be9dddbca3674 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4066,8 +4066,6 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 	LLFolderType::EType type = category->getPreferredType();
 	const bool is_system_folder = LLFolderType::lookupIsProtectedType(type);
 	// BAP change once we're no longer treating regular categories as ensembles.
-	const bool is_ensemble = (type == LLFolderType::FT_NONE ||
-		LLFolderType::lookupIsEnsembleType(type));
 	const bool is_agent_inventory = isAgentInventory();
 
 	// Only enable calling-card related options for non-system folders.
@@ -4110,30 +4108,26 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 			}
 
 			items.push_back(std::string("Replace Outfit"));
-
-			if (is_agent_inventory)
+		}
+		if (is_agent_inventory)
+		{
+			items.push_back(std::string("Folder Wearables Separator"));
+			items.push_back(std::string("Remove From Outfit"));
+			if (!LLAppearanceMgr::getCanRemoveFromCOF(mUUID))
 			{
-				items.push_back(std::string("Folder Wearables Separator"));
-				if (is_ensemble)
-				{
-					items.push_back(std::string("Wear As Ensemble"));
-				}
-				items.push_back(std::string("Remove From Outfit"));
-				if (!LLAppearanceMgr::getCanRemoveFromCOF(mUUID))
-				{
 					disabled_items.push_back(std::string("Remove From Outfit"));
-				}
-			}
-			if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
-			{
-				disabled_items.push_back(std::string("Replace Outfit"));
-			}
-			if (!LLAppearanceMgr::instance().getCanAddToCOF(mUUID))
-			{
-				disabled_items.push_back(std::string("Add To Outfit"));
 			}
-			items.push_back(std::string("Outfit Separator"));
 		}
+		if (!LLAppearanceMgr::instance().getCanReplaceCOF(mUUID))
+		{
+			disabled_items.push_back(std::string("Replace Outfit"));
+		}
+		if (!LLAppearanceMgr::instance().getCanAddToCOF(mUUID))
+		{
+			disabled_items.push_back(std::string("Add To Outfit"));
+		}
+		items.push_back(std::string("Outfit Separator"));
+
 	}
 }