This reverts commit 3017bfcd07. This was causing sbt to be unable to compile. Reverting temporarily until we have a shot at a full fix.
3017bfcd07