WIP: Resolve "When old master restores, it should be marked as unhealthy"

Closes #2697