diff --git a/tasks/main.yml b/tasks/main.yml
index 8dfa813..37498d6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,24 +17,9 @@
     - name: Postgres replication standby
       shell: '{{ apigee_service }} apigee-postgresql setup-replication-on-standby -f {{ opdk_installation_config_file }}'
 
-- block:
-  - name: Ensure component is started
-    shell: "{{ apigee_all }} start"
+- name: Ensure component is started
+  shell: "{{ apigee_all }} start"
 
-  - name: Wait for ready
-    command: '{{ apigee_service }} apigee-postgresql wait_for_ready'
-    when: validate_ready | default(true)
-
-  - name: Validate postgres replication standby
-    shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
-
-  rescue:
-    - name: Ensure component is started
-      shell: "{{ apigee_all }} start"
-
-    - name: Wait for ready
-      command: '{{ apigee_service }} apigee-postgresql wait_for_ready'
-      when: validate_ready | default(true)
-
-    - name: Validate postgres replication standby
-      shell: '{{ apigee_service }} apigee-postgresql postgres-check-standby'
+- name: Wait for ready
+  command: '{{ apigee_service }} apigee-postgresql wait_for_ready'
+  when: validate_ready | default(true)