Security fix for CVE-2017-3135 (unaffected), fixes regression made by CVE-2016-8864