#687 - disentangle old tariff-revoke scheme