Revert back to using @Manager.calls_manager in heartbeats/storage.py