upstreamed to version 2.0