Decouple 24.0 and main references.
It is important this is NOT swept into main (/cc @wlampl).
/cc @ahabouel @dta