Redmine #6245: Call collect only on active hub.
Revert last changes.