Revert "Merge branch 'trigvaltools_ca' into '23.0'"

This reverts merge request !63501 (merged) as it's causing many ART test failures (ATR-27722). Will look for a proper fix next week.

@coccaro I am setting this to auto-merge to make sure it's going into the nightly.