revert tenant requests approach; revert token requests approach