This reverts merge request !64216 (merged) as it's blocking the weekly reprocessing.
Tagging @jcurran .