Backed out changeset a4d8b4c3d321 (bug 1804303) as it is no longer necessary. r=bhearsum DONTBUILD

We needed one nightly build that updates channel-prefs.js.  Now that
it's done, and a watershed is in place, we can restore mar file
generation to its normal logic.

Differential Revision: https://phabricator.services.mozilla.com/D167036

tools/update-packaging/common.sh

@@ -92,10 +92,6 @@ make_add_instruction() {
 check_for_add_if_not_update() {
   add_if_not_file_chk="$1"
 
-  # XXX unconditional add-if for channel-prefs.js to fix mac signature on old installs (bug 1804303)
-  if [ "$add_if_not_file_chk" = "Contents/Resources/defaults/pref/channel-prefs.js" ]; then
-    return 1
-  fi
   if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \
        `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
     ## "true" *giggle*

tools/update-packaging/make_incremental_update.sh

@@ -78,8 +78,7 @@ if [ $# = 0 ]; then
   exit 1
 fi
 
-# force update to channel-prefs.js for bug 1804303
-requested_forced_updates='Contents/MacOS/firefox Contents/Resources/defaults/pref/channel-prefs.js'
+requested_forced_updates='Contents/MacOS/firefox'
 
 while getopts "hqf:" flag
 do