Revert !55033
Reverting (hopefully just for one day) !55033 (merged) as it seems to cause FT0V, needs approval + CI reference update.
Reverting (hopefully just for one day) !55033 (merged) as it seems to cause FT0V, needs approval + CI reference update.