Pushed as 1bf1226a4f.