[fix] Partial revert of previous revocation changes

To be compatible with mypy, pylint, pytest
Returning in case of dry-run
Not returning a value since mypy and pylint complain
that every parts of the functions should return an integer