Revert "Remove heartbeats completely"