diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 2b8f436f8afaf5c4652015c8b8510c6de0172735..b025725ba08be3a8eba21b192203382a574feaf5 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -10808,7 +10808,7 @@ HandleCrash(SIGNAL_ARGS)
 
 /* Main entry point for startup process */
 void
-StartupProcessMain(int passNum)
+StartupProcessMain(void)
 {
 	am_startup = true;
 	/*
@@ -10830,10 +10830,7 @@ StartupProcessMain(int passNum)
 	pqsignal(SIGALRM, SIG_IGN);
 	pqsignal(SIGPIPE, SIG_IGN);
 	pqsignal(SIGUSR1, StartupProcSigUsr1Handler);
-	if (passNum == 1)
-		pqsignal(SIGUSR2, StartupProcTriggerHandler);
-	else
-		pqsignal(SIGUSR2, SIG_IGN);
+	pqsignal(SIGUSR2, StartupProcTriggerHandler);
 
 #ifdef SIGBUS
 	pqsignal(SIGBUS, HandleCrash);
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 28a1d7dacf7c23e01404a7e438d3593992964b34..89319f74e071df06e382de0f9515410682ddeb2e 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -343,15 +343,6 @@ AuxiliaryProcessMain(int argc, char *argv[])
 			case StartupProcess:
 				statmsg = "startup process";
 				break;
-			case StartupPass2Process:
-				statmsg = "startup pass 2 process";
-				break;
-			case StartupPass3Process:
-				statmsg = "startup pass 3 process";
-				break;
-			case StartupPass4Process:
-				statmsg = "startup pass 4 process";
-				break;
 			case BgWriterProcess:
 				statmsg = "writer process";
 				break;
@@ -454,22 +445,7 @@ AuxiliaryProcessMain(int argc, char *argv[])
 
 		case StartupProcess:
 			/* don't set signals, startup process has its own agenda */
-			StartupProcessMain(1);
-			proc_exit(1);		/* should never return */
-
-		case StartupPass2Process:
-			/* don't set signals, startup process has its own agenda */
-			StartupProcessMain(2);
-			proc_exit(1);		/* should never return */
-
-		case StartupPass3Process:
-			/* don't set signals, startup process has its own agenda */
-			StartupProcessMain(3);
-			proc_exit(1);		/* should never return */
-
-		case StartupPass4Process:
-			/* don't set signals, startup process has its own agenda */
-			StartupProcessMain(4);
+			StartupProcessMain();
 			proc_exit(1);		/* should never return */
 
 		case BgWriterProcess:
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 82003a89948cffa8e6f40c9ea6f2fdcb0c36e8e6..3d9d6ba98c53fc8869386b69da3b4bba946a021f 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -281,7 +281,7 @@ extern char *XLogLocationToString4_Long(XLogRecPtr *loc);
 extern char *XLogLocationToString5_Long(XLogRecPtr *loc);
 
 extern void HandleStartupProcInterrupts(void);
-extern void StartupProcessMain(int passNum);
+extern void StartupProcessMain(void);
 
 extern void xlog_print_redo_lsn_application(
 		RelFileNode		*rnode,
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 2b5fa9616a6bfea778a3da73fd924dfed94ee276..a5ee73b27373d5a05b611929e483e4128c51eb3d 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -485,9 +485,6 @@ typedef enum
 	CheckerProcess = 0,
 	BootstrapProcess,
 	StartupProcess,
-	StartupPass2Process,
-	StartupPass3Process,
-	StartupPass4Process,
 	BgWriterProcess,
 	CheckpointerProcess,
 	WalWriterProcess,
@@ -498,7 +495,7 @@ typedef enum
 
 extern AuxProcType MyAuxProcType; /* bootstrap.c */
 #define AmBootstrapProcess()        (MyAuxProcType == BootstrapProcess)
-#define AmStartupProcess()          (MyAuxProcType >= StartupProcess && MyAuxProcType <= StartupPass4Process)
+#define AmStartupProcess()          (MyAuxProcType == StartupProcess)
 #define AmBackgroundWriterProcess() (MyAuxProcType == BgWriterProcess)
 #define AmCheckpointerProcess()     (MyAuxProcType == CheckpointerProcess)
 #define AmWalWriterProcess()        (MyAuxProcType == WalWriterProcess)