Sigh, even if we don't integrate this pull request, we really really should integrate this.