Otherwise cleaning gets stuck forever because there is no heartbeat implementation to use. Change-Id: I3589038001b98c866f47339ac8d65edfb891ed79