Fix weird commit and version dependencies for CVE-2012-5664