Index: trunk/psModules/src/config/pmConfigMask.c
===================================================================
--- trunk/psModules/src/config/pmConfigMask.c	(revision 19148)
+++ trunk/psModules/src/config/pmConfigMask.c	(revision 19155)
@@ -8,7 +8,4 @@
 
 #include "pmConfigMask.h"
-
-
-//#define FORCE_OLD_MASKS                 // Force old masks to work (at the expense of new masks)
 
 
@@ -84,10 +81,10 @@
     }
 
-#ifdef FORCE_OLD_MASKS
-    return true;
-#endif
-
     int nMask = psMetadataLookupS32(&status, header, "MSKNUM");
     if (!status) {
+        if (psMetadataLookupBool(&status, config->camera, "MASK.FORCE")) {
+            psWarning("No mask values in header.  Assuming MASKS recipe is accurate because of MASK.FORCE");
+            return true;
+        }
         psError(PS_ERR_UNKNOWN, true, "Unable to find MSKNUM in header.");
         return false;