[SROA] Apply a somewhat heavy and unpleasant hammer to fix PR22093, an