[12332] Revert [12298]