Due to missing monitor frontend in tests this change is not covered by tests.
This will create a new commit in order to revert the existing changes.
