diff --git a/debian/scripts/koha-foreach b/debian/scripts/koha-foreach
index 5262cc5218..50f96c71df 100755
--- a/debian/scripts/koha-foreach
+++ b/debian/scripts/koha-foreach
@@ -46,21 +46,13 @@ do
     esac
     shift
 done
-            
+
 for name in $(koha-list $listopts)
 do
-    # Optionally use alternative paths for a dev install
-    adjust_paths_dev_install $name
-
+    # Replace the __instancename__ placeholder for the instance name (Bug 8566)
     cmd=`echo "$@" | sed -e s/__instancename__/${name}/g`
-    (
-    exec 3>&1
-    sudo -u "$name-koha" \
-    env PERL5LIB=$PERL5LIB \
-        KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml" \
-        ${cmd} 2>&1 >&3 | sed -e "s/^/$name: /" >&2 3>&-
-    exec 3>&-
-    ) | sed -e "s/^/$name: /"
 
+    if [ "${cmd}" != "" ]; then
+        koha-shell ${name} -c "${cmd}"
+    fi
 done
-