Going to leave the llvm-general constraint until it's obviously fixed