Pushed as 7959aabbe1.