Merge pull request #70 from barak/upstream

Remove dead code from CVE-2012-0722 patch provided by Sajjad