diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 90fbeb5d6c5f..dea909f5a2f0 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -53,7 +53,7 @@ function dm_remove_files() {
   shift
 
   for file in "$@" ; do
-    [ -f "$tgt/$file" ] && rm -f "$tgt/$file"
+    [ -f "$tgt/$file" -o -L "$tgt/$file" ] && rm -f "$tgt/$file"
   done
 }
 
@@ -208,6 +208,8 @@ function dm_install_vendor() {
 
   [ ! -d "$to" ] && mkdir "$to"
   ${DM_RSYNC:-rsync} -avC $excludes_rsync "$repo/./" "$to/./"
+  ## We don't this use CLI script in production, and the symlink breaks D7/BD URL installs
+  dm_remove_files "$to" "bin/pscss"
 }
 
 ##  usage: dm_install_wordpress <wp_repo_path> <to_path>