[trunk] Revert r2623 for now