diff --git a/lib/kubernetes-deploy/kubernetes_resource/deployment.rb b/lib/kubernetes-deploy/kubernetes_resource/deployment.rb
index 971092adf..345f46549 100644
--- a/lib/kubernetes-deploy/kubernetes_resource/deployment.rb
+++ b/lib/kubernetes-deploy/kubernetes_resource/deployment.rb
@@ -61,11 +61,7 @@ def timeout_message
     end
 
     def deploy_timed_out?
-      if @progress
-        @progress["status"] == 'False'
-      else
-        super || @latest_rs && @latest_rs.deploy_timed_out?
-      end
+      @progress ? @progress["status"] == 'False' : super
     end
 
     def exists?
diff --git a/lib/kubernetes-deploy/kubernetes_resource/replica_set.rb b/lib/kubernetes-deploy/kubernetes_resource/replica_set.rb
index 23e005553..963e85068 100644
--- a/lib/kubernetes-deploy/kubernetes_resource/replica_set.rb
+++ b/lib/kubernetes-deploy/kubernetes_resource/replica_set.rb
@@ -50,10 +50,6 @@ def timeout_message
       @pods.map(&:timeout_message).compact.uniq.join("\n")
     end
 
-    def deploy_timed_out?
-      super || @pods.present? && @pods.all?(&:deploy_timed_out?)
-    end
-
     def exists?
       @found
     end