diff --git a/config/galaxy.ini.sample b/config/galaxy.ini.sample
index abd735e1cb2..53a09516b40 100644
--- a/config/galaxy.ini.sample
+++ b/config/galaxy.ini.sample
@@ -1306,7 +1306,7 @@ use_interactive = True
 #
 # https://galaxyproject.org/admin/config/performance/cluster
 #
-#drmaa_external_runjob_script = sudo -E scripts/drmaa_external_runner.py
+#drmaa_external_runjob_script = sudo -E scripts/drmaa_external_runner.py --assign_all_groups
 #drmaa_external_killjob_script = sudo -E scripts/drmaa_external_killer.py
 #external_chown_script = sudo -E scripts/external_chown_script.py
 
diff --git a/lib/galaxy/jobs/runners/drmaa.py b/lib/galaxy/jobs/runners/drmaa.py
index 48cc907532e..3d085094551 100644
--- a/lib/galaxy/jobs/runners/drmaa.py
+++ b/lib/galaxy/jobs/runners/drmaa.py
@@ -364,7 +364,6 @@ class DRMAAJobRunner( AsynchronousJobRunner ):
         """
         command = shlex.split( external_runjob_script )
         command.extend( [ str(username), jobtemplate_filename ] )
-        command.append( "--assign_all_groups"  )
         log.info("Running command %s" % command)
         p = subprocess.Popen(command,
                              shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/scripts/drmaa_external_runner.py b/scripts/drmaa_external_runner.py
index c69a92a5512..a859b8cd9b5 100755
--- a/scripts/drmaa_external_runner.py
+++ b/scripts/drmaa_external_runner.py
@@ -84,7 +84,8 @@ def validate_paramters():
 
 def set_user(uid, assign_all_groups):
     try:
-        # Get user's default group and set it to current process to make sure file permissions are inherited correctly
+        # Get user's default group and set it to current process to make sure
+        # file permissions are inherited correctly
         # Solves issue with permission denied for JSON files
         gid = pwd.getpwuid(uid).pw_gid
         import grp