Sorry if I already asked this, but has this back been reported upstream?

Also, move the `url` and `sha1` into this stable block.