Also seems easy to fix.

Please review rt46745