Don't we still need to do this?  We'll leak URIs otherwise.