--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java	2017-03-20 17:40:17.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java	2017-03-20 17:40:17.000000000 -0700
@@ -26,13 +26,10 @@
 
 import org.openjdk.jmh.annotations.Benchmark;
 
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.lir.gen.LIRGenerationResult;
 import org.graalvm.compiler.lir.phases.LIRSuites;
 import org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark;
 import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.options.OptionValue;
-import org.graalvm.compiler.options.OptionValue.OverrideScope;
 
 public class RegisterAllocationTimeBenchmark extends GraalBenchmark {
 
@@ -41,9 +38,7 @@
         @SuppressWarnings("try")
         @Override
         protected LIRSuites createLIRSuites() {
-            try (OverrideScope os = OptionValue.override(GraalOptions.TraceRA, false)) {
-                return super.createLIRSuites();
-            }
+            return super.createLIRSuites();
         }
     }
 
@@ -69,9 +64,7 @@
         @SuppressWarnings("try")
         @Override
         protected LIRSuites createLIRSuites() {
-            try (OverrideScope os = OptionValue.override(GraalOptions.TraceRA, true)) {
-                return super.createLIRSuites();
-            }
+            return super.createLIRSuites();
         }
     }