Fix 1444

I still need to add a deprecation to 2.99 for the change in the 2nd commit.