Revert to old Scala library & compiler bundles