This was pushed as commit e7cdd311ae2696713da59a4f27614a246ca0f58a.