diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index 365737d89..2ea14db3e 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -49,7 +49,7 @@ APP_LONG_NAME="I2P Service"
 
 # gettext - we look for it in the path
 # fallback to echo is below, we can't set it to echo here.
-GETTEXT=$(which gettext > /dev/null 2>&1)
+GETTEXT=%gettext%
 
 # Where to install the systemd service
 SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index eb4995dfe..0186cede3 100644
--- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh
@@ -25,7 +25,7 @@ CP=
 
 # Try using the Java binary that I2P was installed with.
 # If it's not found, try looking in the system PATH.
-JAVA=$(which "%JAVA_HOME"/bin/java || which java)
+JAVA=%JAVA%
 
 if [ -z $JAVA ] || [ ! -x $JAVA ]; then
     echo "Error: Cannot find java." >&2
@@ -44,15 +44,4 @@ if [ $(uname -s) = "Darwin" ]; then
     export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
 fi
 JAVAOPTS="${MAXMEMOPT} -Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
-(
-    nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
-) &
-PID=$!
-
-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then
-    echo "I2P started [$PID]" >&2
-    echo $PID > "${I2PTEMP}/router.pid"
-else
-    echo "I2P failed to start." >&2
-    exit 1
-fi
+exec ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch