Revert "integer overflow in expression fix"

This reverts commit bdef14163775701acc685ec2af75bd47346a3ed8.