Fix for issue 4839

Fixed so that changing address to a non-taxable zone now reverts the applied tax. 

(not trying to be lazy, btw, i just know you were in the middle of merging this branch so don't want to cause any conflict)