Revert "Improve handling of failed primary replica handling"

This reverts commit 75ed24f6b6a96ac268f7b085550020252d94d908.