Manually applying sbt/sbt#1382