diff --git a/OpenRA.Game/Primitives/ObservableCollection.cs b/OpenRA.Game/Primitives/ObservableCollection.cs
index 41c2d476e6..ad176f9cbf 100644
--- a/OpenRA.Game/Primitives/ObservableCollection.cs
+++ b/OpenRA.Game/Primitives/ObservableCollection.cs
@@ -20,10 +20,7 @@ namespace OpenRA.Primitives
 	{
 		public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
 
-		// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
-		#pragma warning disable 67
 		public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
-		#pragma warning restore
 		public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
 		public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
 		public event Action<IObservableCollection> OnRefresh = x => { };
diff --git a/OpenRA.Game/Primitives/ObservableDictionary.cs b/OpenRA.Game/Primitives/ObservableDictionary.cs
index 08d31b6cb8..92fbf80266 100644
--- a/OpenRA.Game/Primitives/ObservableDictionary.cs
+++ b/OpenRA.Game/Primitives/ObservableDictionary.cs
@@ -36,11 +36,8 @@ namespace OpenRA.Primitives
 		public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
 		public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
 
-		// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
-		#pragma warning disable 67
 		public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
 		public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
-		#pragma warning restore
 		public event Action<IObservableCollection> OnRefresh = x => { };
 
 		protected void FireOnRefresh()
diff --git a/OpenRA.Game/Primitives/ObservableList.cs b/OpenRA.Game/Primitives/ObservableList.cs
index 7f381258a2..75db986eed 100644
--- a/OpenRA.Game/Primitives/ObservableList.cs
+++ b/OpenRA.Game/Primitives/ObservableList.cs
@@ -22,11 +22,8 @@ namespace OpenRA.Primitives
 		public event Action<IObservableCollection, object> OnAdd = (x, k) => { };
 		public event Action<IObservableCollection, object> OnRemove = (x, k) => { };
 
-		// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
-		#pragma warning disable 67
 		public event Action<IObservableCollection, int> OnRemoveAt = (x, i) => { };
 		public event Action<IObservableCollection, object, object> OnSet = (x, o, n) => { };
-		#pragma warning restore
 		public event Action<IObservableCollection> OnRefresh = x => { };
 
 		protected void FireOnRefresh()