diff --git a/oam/install_scripts/post-mysql-install b/oam/install_scripts/post-mysql-install
index 7960c7637..fde38f797 100755
--- a/oam/install_scripts/post-mysql-install
+++ b/oam/install_scripts/post-mysql-install
@@ -20,14 +20,6 @@ checkForError() {
 	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
 		  echo "MySQL Password file missing or incorrect, check .my.cnf file"
 		  rm -f ${tmpdir}/error.check
-          # Test we are using systemd
-          systemctl cat mariadb.service > /dev/null 2>&1
-          if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-              systemctl stop mariadb.service > /dev/null 2>&1
-          else
-              pkill mysqld
-          fi
-		  sleep 2
 		  exit 2;
 	fi
 
@@ -68,51 +60,13 @@ for arg in "$@"; do
 	fi
 done
 
-# Restart in the same way that mysqld will be started normally.
-# Test we are using systemd
-systemctl cat mariadb.service > /dev/null 2>&1
-if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-    systemctl stop mariadb.service > /dev/null 2>&1
-else
-    pkill mysqld
-fi
-sleep 2
-export MYSQL_OPTS="--skip-grant-tables"
-# Test we are using systemd
-systemctl cat mariadb.service > /dev/null 2>&1
-if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-    systemctl start mariadb.service
-else
-    /usr/bin/mysqld_safe --skip-grant-tables &
-fi
-unset MYSQL_OPTS
-
-sleep 5
-
 # Install various Calpont stuff...
 install_mcs_mysql.sh  --tmpdir=$tmpdir
 checkForError
 if [ $? -ne 0 ]; then
     echo "ERROR: Invalid password in .my.cnf, or Columnstore plugin install missing"
-    # Test we are using systemd
-    systemctl cat mariadb.service > /dev/null 2>&1
-    if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-        systemctl stop mariadb.service > /dev/null 2>&1
-    else
-        pkill mysqld
-    fi
-    sleep 2
     exit 2;
 fi
 
-# Test we are using systemd
-systemctl cat mariadb.service > /dev/null 2>&1
-if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
-    systemctl stop mariadb.service > /dev/null 2>&1
-else
-    pkill mysqld
-fi
-
-
 exit 0