FYI @mattwala This seems to have taken care of the CI hangs. Not sure what the sympy guys are up to. Made the analogous change in sympy.