Undo scala naivete fail from 2c04dd8!

Thanks Jason!