Reinstate 4+91+fixes for a CVE