diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1d518b1d42..ce8e81ee07 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -38,12 +38,9 @@ if $::hostname == downcase(hiera('bootstrap_nodeid')) {
 }
 
 # When to start and enable services which haven't been Pacemakerized
-# FIXME: change to only step 4 after this patch is merged:
-# https://review.openstack.org/#/c/180565/
-# $non_pcmk_start = hiera('step') >= 4
 # FIXME: remove when we start all OpenStack services using Pacemaker
 # (occurences of this variable will be gradually replaced with false)
-$non_pcmk_start = hiera('step') >= 4 or (hiera('step') >= 3 and $pacemaker_master)
+$non_pcmk_start = hiera('step') >= 4
 
 if hiera('step') >= 1 {