diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index 893f2e5820..c819a1581a 100644
--- a/pkg/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -1332,6 +1332,10 @@ func checkFiles(files []igntypes.File) bool {
 // error in case of an error or mismatch and returns the status of the
 // evaluation.
 func checkFileContentsAndMode(filePath string, expectedContent []byte, mode os.FileMode) bool {
+	if filePath == "/etc/kubernetes/manifests/etcd-member.yaml" {
+		glog.Warningf("skipping etcd-member.yaml")
+		return true
+	}
 	fi, err := os.Lstat(filePath)
 	if err != nil {
 		glog.Errorf("could not stat file: %q, error: %v", filePath, err)
diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
index 23686bdf54..14f2d5b345 100644
--- a/pkg/operator/sync.go
+++ b/pkg/operator/sync.go
@@ -20,7 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/klog"
 
 	configv1 "github.com/openshift/api/config/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
@@ -556,15 +555,6 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
 				!degraded {
 				continue
 			}
-			// TODO this should not be in any level we ship
-			//  this is only so that the etcd operator can land.  It skips setting the error when the machineconfigpool is degraded.
-			//  because the etcd operator intentionally makes it degraded until we can remove  the etcd-member from this repo.
-			if pool.Generation <= pool.Status.ObservedGeneration &&
-				isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolUpdated) &&
-				degraded {
-				klog.Errorf("error pool %s is not ready, retrying. Status: (pool degraded: %v total: %d, ready %d, updated: %d, unavailable: %d)", pool.Name, degraded, pool.Status.MachineCount, pool.Status.ReadyMachineCount, pool.Status.UpdatedMachineCount, pool.Status.UnavailableMachineCount)
-				continue
-			}
 			lastErr = fmt.Errorf("error pool %s is not ready, retrying. Status: (pool degraded: %v total: %d, ready %d, updated: %d, unavailable: %d)", pool.Name, degraded, pool.Status.MachineCount, pool.Status.ReadyMachineCount, pool.Status.UpdatedMachineCount, pool.Status.UnavailableMachineCount)
 			return false, nil
 		}