diff --git a/nova/templates/bin/_health-probe.py.tpl b/nova/templates/bin/_health-probe.py.tpl
index 2cde2d42c9..d78e70139d 100644
--- a/nova/templates/bin/_health-probe.py.tpl
+++ b/nova/templates/bin/_health-probe.py.tpl
@@ -97,18 +97,10 @@ def check_service_status(transport):
 
 def tcp_socket_status(process, ports):
     """Check the tcp socket status on a process"""
-    sock_count = 0
-    parentId = 0
     for p in psutil.process_iter():
         try:
             with p.oneshot():
                 if process in " ".join(p.cmdline()):
-                    if parentId == 0:
-                        parentId = p.pid
-                    else:
-                        if p.ppid() == parentId and \
-                                not cfg.CONF.check_all_pids:
-                            continue
                     pcon = p.connections()
                     for con in pcon:
                         try:
@@ -117,14 +109,10 @@ def tcp_socket_status(process, ports):
                         except IndexError:
                             continue
                         if rport in ports and status == tcp_established:
-                            sock_count = sock_count + 1
+                            return 1
         except psutil.Error:
             continue
-
-    if sock_count == 0:
-        return 0
-    else:
-        return 1
+    return 0
 
 
 def configured_port_in_conf():
@@ -198,8 +186,6 @@ def test_rpc_liveness():
     cfg.CONF.register_cli_opt(cfg.StrOpt('service-queue-name'))
     cfg.CONF.register_cli_opt(cfg.BoolOpt('liveness-probe', default=False,
                                           required=False))
-    cfg.CONF.register_cli_opt(cfg.BoolOpt('check-all-pids', default=False,
-                                          required=False))
     cfg.CONF.register_cli_opt(cfg.BoolOpt('use-fqdn', default=False,
                                           required=False))
 
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index 05ee94923d..cb9e9df35c 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -68,7 +68,6 @@ spec:
                 - /etc/nova/nova.conf
                 - --service-queue-name
                 - scheduler
-                - --check-all-pids
             initialDelaySeconds: 80
             periodSeconds: 90
             timeoutSeconds: 70
@@ -82,7 +81,6 @@ spec:
                 - --service-queue-name
                 - scheduler
                 - --liveness-probe
-                - --check-all-pids
             initialDelaySeconds: 120
             periodSeconds: 90
             timeoutSeconds: 70