1 files changed, 1 insertions, 5 deletions
diff --git a/src/repl/scala/tools/nsc/MainGenericRunner.scala b/src/repl/scala/tools/nsc/MainGenericRunner.scala
index a09e797e07..894157ff6c 100644
--- a/src/repl/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/repl/scala/tools/nsc/MainGenericRunner.scala
@@ -49,10 +49,6 @@ class MainGenericRunner {
       def isI   = !settings.loadfiles.isDefault
       def dashi = settings.loadfiles.value
 
-      // Deadlocks on startup under -i unless we disable async.
-      if (isI)
-        settings.Yreplsync.value = true
-
       def combinedCode  = {
         val files   = if (isI) dashi map (file => File(file).slurp()) else Nil
         val str     = if (isE) List(dashe) else Nil
@@ -98,7 +94,7 @@ class MainGenericRunner {
     if (!command.ok)
       errorFn(f"%n$shortUsageMsg")
     else if (shouldStopWithInfo)
-      errorFn(command getInfoMessage sampleCompiler, isFailure = false)
+      errorFn(command.getInfoMessage(sampleCompiler), isFailure = false)
     else
       run()
   }