--- a/bash/variables.c.orig	2016-10-23 20:50:41.850176398 +0000
+++ a/bash/variables.c	2016-10-23 20:51:39.185346623 +0000
@@ -467,10 +467,7 @@
       set_if_not ("PS2", secondary_prompt);
     }
 
-  if (current_user.euid == 0)
-    bind_variable ("PS4", "+ ", 0);
-  else
-    set_if_not ("PS4", "+ ");
+  bind_variable ("PS4", "+ ", 0);
 
   /* Don't allow IFS to be imported from the environment. */
   temp_var = bind_variable ("IFS", " \t\n", 0);