Pushed as 620669fd17..acfa55a581.