Reverted back to Scala 2.8.0