See my comment for the commit :)