Decouple listening for messages from autorecover