Revert "Prevent integer overflow in some gas calculations"

This reverts commit 465e682dc61e6e0cf55a25a1bd94356a004ac673.