diff -rup bash-4.3.30/variables.c bash-4.3.30-new/variables.c
--- bash-4.3.30/variables.c	2014-10-01 09:57:51.000000000 -0700
+++ bash-4.3.30-new/variables.c	2017-04-05 15:03:25.036413199 -0700
@@ -495,7 +495,11 @@ initialize_shell_variables (env, privmod
 #endif
       set_if_not ("PS2", secondary_prompt);
     }
-  set_if_not ("PS4", "+ ");
+
+  if (current_user.euid == 0)
+    bind_variable ("PS4", "+ ", 0);
+  else
+    set_if_not ("PS4", "+ ");
 
   /* Don't allow IFS to be imported from the environment. */
   temp_var = bind_variable ("IFS", " \t\n", 0);