diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 27c58b764..7ba3bf859 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2896,7 +2896,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 		restoreItem();
 		return;
 	}
-#ifndef LL_RELEASE_FOR_DOWNLOAD
+#ifdef DELETE_SYSTEM_FOLDERS
 	else if ("delete_system_folder" == action)
 	{
 		removeSystemFolder();
@@ -3455,7 +3455,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags)
 		mDisabledItems.push_back(std::string("Delete"));
 	}
 
-#ifndef LL_RELEASE_FOR_DOWNLOAD
+#ifdef DELETE_SYSTEM_FOLDERS
 	if (LLFolderType::lookupIsProtectedType(type))
 	{
 		mItems.push_back(std::string("Delete System Folder"));
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index b5a572c0c..1099c165d 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -409,10 +409,12 @@ BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id)
 
 	const LLFolderType::EType folder_type = category->getPreferredType();
 	
+#ifndef DELETE_SYSTEM_FOLDERS
 	if (LLFolderType::lookupIsProtectedType(folder_type))
 	{
 		return FALSE;
 	}
+#endif
 
 	// Can't delete the outfit that is currently being worn.
 	if (folder_type == LLFolderType::FT_OUTFIT)