The patch has been committed, but it's a workaround, not a fix. I think this
bug should remain open until a proper fix has been found.