Revert to previous logic, but fix tax total #3924