Pushed as commit 60eee3e6de2a11b425496bbdf90bfe1f807c8f49 after a review from ngz on IRC.