Revert to old Scala library & compiler bundles
Reverts 8e3c135a021935cd01fde42f5daea89136fb1a4d