Pushed as 8d27e6a7cf..e1fb55ab67.