diff --git a/orchestrator/taste-orchestrator.py b/orchestrator/taste-orchestrator.py
index 2b7f24d055a404fb436be6d50d8ec9acdb08a062..ed8757a8e0f6567c1c2120faa794ea3e798c6873 100644
--- a/orchestrator/taste-orchestrator.py
+++ b/orchestrator/taste-orchestrator.py
@@ -1300,20 +1300,6 @@ def InvokeOcarinaMakefiles(
             if len(cppSubsystems)>0:
                 userLDFlags += " -lstdc++ "
 
-            # Workaround for bug in the new GNAT - crashes if it sees multiple -m32
-            def keepOnlyFirstCompilationOption(flags):
-                cmd = ""
-                tokensUnique = {}
-                for token in flags.split():
-                    if token.startswith("-") and not token.startswith("-I"):
-                        if token not in tokensUnique:
-                            tokensUnique[token] = 1
-                            cmd += " " + token
-                    else:
-                        cmd += " " + token
-                return cmd + " "
-            userCFlags = keepOnlyFirstCompilationOption(userCFlags)
-            userLDFlags = keepOnlyFirstCompilationOption(userLDFlags)
             if "GNAT_RUNTIME" in platformType:
                 userCFlags = userCFlags.replace(" -mfloat-abi=hard ", " ")  # Not supported when compiling Ada
                 userLDFlags = userLDFlags.replace(" -mfloat-abi=hard ", " ")  # Not supported when compiling Ada