Really fixes #2261: the original tax should not be kept when we have a mapping

See the detailed explaination of this "fix of the fix" on the bug report #2261