Remove broken overflow calculation. Where should we be doing this?