Bring r254336 back: