diff --git a/.travis.yml b/.travis.yml
index 494b09b04..dde4cda88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
     # WHITESOURCE_PASSWORD=
     - secure: d3bu2KNwsVHwfhbGgO+gmRfDKBJhfICdCJFGWKf2w3Gv86AJZX9nuTYRxz0KtdvEHO5Xw8WTBZLPb2thSJqhw9OCm4J8TBAVqCP0ruUj4+aqBUFy4bVexQ6WKE6nWHs4JPzPk8c6uC1LG3hMuzlC8RGETXtL/n81Ef1u7NjyXjs=
   matrix:
-    - SBT_CMD=";mimaReportBinaryIssues ;scalafmt::test ;test:scalafmt::test ;sbt:scalafmt::test ;headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile ;mainSettingsProj/test ;safeUnitTests ;otherUnitTests; doc"
+    - SBT_CMD=";mimaReportBinaryIssues ;scalafmtCheck ;headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile ;mainSettingsProj/test ;safeUnitTests ;otherUnitTests; doc"
     - SBT_CMD="scripted actions/*"
     - SBT_CMD="scripted apiinfo/* compiler-project/* ivy-deps-management/*"
     - SBT_CMD="scripted dependency-management/*1of4"
diff --git a/build.sbt b/build.sbt
index 0adde9d37..f08ed2186 100644
--- a/build.sbt
+++ b/build.sbt
@@ -40,8 +40,6 @@ def buildLevelSettings: Seq[Setting[_]] =
       scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt"), "git@github.com:sbt/sbt.git")),
       resolvers += Resolver.mavenLocal,
       scalafmtOnCompile := true,
-      scalafmtOnCompile in Sbt := false,
-      scalafmtVersion := "1.4.0",
     ))
 
 def commonSettings: Seq[Setting[_]] = Def.settings(
diff --git a/main-command/src/main/scala/sbt/Command.scala b/main-command/src/main/scala/sbt/Command.scala
index 6060592aa..ea616cb6e 100644
--- a/main-command/src/main/scala/sbt/Command.scala
+++ b/main-command/src/main/scala/sbt/Command.scala
@@ -58,6 +58,8 @@ private[sbt] final class ArbitraryCommand(
     new ArbitraryCommand(parser, help, tags.put(key, value))
 }
 
+// format: off
+
 object Command {
   import DefaultParsers._
 
@@ -219,6 +221,8 @@ object Command {
     ((c & opOrIDSpaced(name)) ~ c.+) map { case (f, rem) => (f +: rem).mkString }
 }
 
+// format: on
+
 trait Help {
   def detail: Map[String, String]
   def brief: Seq[(String, String)]
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 17584c663..72f595f99 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,7 +2,7 @@ scalaVersion := "2.12.8"
 scalacOptions ++= Seq("-feature", "-language:postfixOps")
 
 addSbtPlugin("org.scala-sbt"     % "sbt-houserules"  % "0.3.9")
-addSbtPlugin("com.lucidchart"    % "sbt-scalafmt"    % "1.15")
+addSbtPlugin("com.geirsson"      % "sbt-scalafmt"    % "1.5.1")
 addSbtPlugin("org.scala-sbt"     % "sbt-contraband"  % "0.4.1")
 addSbtPlugin("de.heikoseeberger" % "sbt-header"      % "3.0.2")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"   % "0.8.0")