[trunk] Rework previous commit r2610