diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index b1ab9dda4..0d0d33724 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -659,16 +659,14 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 	return t.render();
 }
 
-string IRGenerator::memoryInit(bool _useMemoryGuard)
+string IRGenerator::memoryInit(bool)
 {
 	// This function should be called at the beginning of the EVM call frame
 	// and thus can assume all memory to be zero, including the contents of
 	// the "zero memory area" (the position CompilerUtils::zeroPointer points to).
 	return
 		Whiskers{
-			_useMemoryGuard ?
-			"mstore(<memPtr>, memoryguard(<freeMemoryStart>))" :
-			"mstore(<memPtr>, <freeMemoryStart>)"
+			"mstore(<memPtr>, memoryguard(<freeMemoryStart>))"
 		}
 		("memPtr", to_string(CompilerUtils::freeMemoryPointer))
 		(
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 4a0745431..8dfd526ff 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -74,37 +74,21 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 			obj = m_compiler.ewasmObject(contractName);
 		else
 		{
-			// Try compiling twice: If the first run fails due to stack errors, forcefully enable
-			// the optimizer.
-			for (bool forceEnableOptimizer: {false, true})
+			OptimiserSettings optimiserSettings = m_optimiserSettings;
+			if (!optimiserSettings.runYulOptimiser)
 			{
-				OptimiserSettings optimiserSettings = m_optimiserSettings;
-				if (!forceEnableOptimizer && !optimiserSettings.runYulOptimiser)
-				{
-					// Enable some optimizations on the first run
-					optimiserSettings.runYulOptimiser = true;
-					optimiserSettings.yulOptimiserSteps = "uljmul jmul";
-				}
-				else if (forceEnableOptimizer)
-					optimiserSettings = OptimiserSettings::full();
-
-				yul::AssemblyStack
-					asmStack(m_evmVersion, yul::AssemblyStack::Language::StrictAssembly, optimiserSettings);
-				bool analysisSuccessful = asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(contractName));
-				solAssert(analysisSuccessful, "Code that passed analysis in CompilerStack can't have errors");
-
-				try
-				{
-					asmStack.optimize();
-					obj = std::move(*asmStack.assemble(yul::AssemblyStack::Machine::EVM).bytecode);
-					break;
-				}
-				catch (...)
-				{
-					if (forceEnableOptimizer || optimiserSettings == OptimiserSettings::full())
-						throw;
-				}
+				// Enable some optimizations on the first run
+				optimiserSettings.runYulOptimiser = true;
+				optimiserSettings.yulOptimiserSteps = "uljmul jmul";
 			}
+
+			yul::AssemblyStack
+				asmStack(m_evmVersion, yul::AssemblyStack::Language::StrictAssembly, optimiserSettings);
+			bool analysisSuccessful = asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(contractName));
+			solAssert(analysisSuccessful, "Code that passed analysis in CompilerStack can't have errors");
+
+			asmStack.optimize();
+			obj = std::move(*asmStack.assemble(yul::AssemblyStack::Machine::EVM).bytecode);
 		}
 	}
 	else