--- systemd-units/plymouth-halt.service.in.orig
+++ systemd-units/plymouth-halt.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-kexec.service.in.orig
+++ systemd-units/plymouth-kexec.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-poweroff.service.in.orig
+++ systemd-units/plymouth-poweroff.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-reboot.service.in.orig
+++ systemd-units/plymouth-reboot.service.in
@@ -6,6 +6,5 @@ DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
--- systemd-units/plymouth-start.service.in.orig
+++ systemd-units/plymouth-start.service.in
@@ -7,8 +7,7 @@ Before=systemd-ask-password-plymouth.ser
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=boot --attach-to-session
 ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash
-Type=forking
 KillMode=none
 SendSIGKILL=no