Revert "Fix CVE 2013-4495. Note: this patch has been verified as fixing this security hole but has not received other regression testing."

This reverts commit 64da0af7ed27284f3397081313850bba270593db.
Use Michael Jenning's patch for CVE 2013-4495 instead of the original. This one is being used because 2.5 should face the minimal possible change.