Revert "Improve handling of failed primary replica handling"

This reverts commit aba7bf366537947639f378cf38fd88576b380655.