Revert "bugfix: overflow error when kosher flag set"
Revert "bugfix: overflow error when kosher flag set"

May have caused possible unwanted side-effects
athenexcalibur/gp8,athenexcalibur/gp8,athenexcalibur/gp8