Revert tax behavior

The issue described in #869 requires a comprehensive fix. This pull request reverts the small change below, that was inserted in #870 and was used while testing the incorrect behavior, to the previous state; the issue is still outstanding.