diff --git a/cjpeg.c b/cjpeg.c
index 784e7bc0..c6ea0910 100644
--- a/cjpeg.c
+++ b/cjpeg.c
@@ -634,8 +634,6 @@ main (int argc, char **argv)
    */
 
   cinfo.in_color_space = JCS_RGB; /* arbitrary guess */
-  if (jpeg_c_bool_param_supported(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS))
-    jpeg_c_set_bool_param(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS, TRUE);
   jpeg_set_defaults(&cinfo);
 
   /* Scan command line to find file names.
diff --git a/example.c b/example.c
index 72939acf..0a65a6cc 100644
--- a/example.c
+++ b/example.c
@@ -126,8 +126,6 @@ write_JPEG_file (char * filename, int quality)
   cinfo.image_height = image_height;
   cinfo.input_components = 3;           /* # of color components per pixel */
   cinfo.in_color_space = JCS_RGB;       /* colorspace of input image */
-  jpeg_c_set_bool_param(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS, TRUE); /* use Mozilla defaults for improved compression */
-  
   /* Now use the library's routine to set default compression parameters.
    * (You must set at least cinfo.in_color_space before calling this,
    * since the defaults depend on the source color space.)
diff --git a/jcapimin.c b/jcapimin.c
index b16f9e40..8935546b 100644
--- a/jcapimin.c
+++ b/jcapimin.c
@@ -99,6 +99,7 @@ jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
   cinfo->master = (struct jpeg_comp_master *)
       jpeg_get_small ((j_common_ptr) cinfo, sizeof(struct jpeg_comp_master));
   MEMZERO(cinfo->master, sizeof(struct jpeg_comp_master));
+  cinfo->master->use_moz_defaults = TRUE;
 }
 
 
diff --git a/jcstest.c b/jcstest.c
index 79829e6b..358ed251 100644
--- a/jcstest.c
+++ b/jcstest.c
@@ -1,7 +1,5 @@
 /*
  * Copyright (C)2011 D. R. Commander.  All Rights Reserved.
- * mozjpeg Modifications:
- * Copyright (C) 2014, Mozilla Corporation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -87,8 +85,6 @@ int main(void)
 
   jpeg_create_compress(&cinfo);
   cinfo.input_components = 3;
-  if (jpeg_c_bool_param_supported(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS))
-    jpeg_c_set_bool_param(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS, TRUE);
   jpeg_set_defaults(&cinfo);
   cinfo.in_color_space = JCS_EXT_RGB;
   jpeg_default_colorspace(&cinfo);
diff --git a/jpegtran.c b/jpegtran.c
index 8275d1a9..926c2774 100644
--- a/jpegtran.c
+++ b/jpegtran.c
@@ -415,8 +415,6 @@ main (int argc, char **argv)
   /* Initialize the JPEG compression object with default error handling. */
   dstinfo.err = jpeg_std_error(&jdsterr);
   jpeg_create_compress(&dstinfo);
-  if (jpeg_c_bool_param_supported(&dstinfo, JBOOLEAN_USE_MOZ_DEFAULTS))
-    jpeg_c_set_bool_param(&dstinfo, JBOOLEAN_USE_MOZ_DEFAULTS, TRUE);
 
   /* Scan command line to find file names.
    * It is convenient to use just one switch-parsing routine, but the switch
diff --git a/turbojpeg.c b/turbojpeg.c
index 16aa9088..7617ef8b 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -206,7 +206,6 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo,
 	}
 
 	cinfo->input_components=tjPixelSize[pixelFormat];
-	cinfo->master->use_moz_defaults = TRUE;
 	jpeg_set_defaults(cinfo);
 
 	if((env=getenv("TJ_OPTIMIZE"))!=NULL && strlen(env)>0 && !strcmp(env, "1"))
diff --git a/yuvjpeg.c b/yuvjpeg.c
index 0a94079c..11437941 100644
--- a/yuvjpeg.c
+++ b/yuvjpeg.c
@@ -217,9 +217,6 @@ int main(int argc, char *argv[]) {
 
   jpeg_stdio_dest(&cinfo, jpg_fd);
 
-  if (jpeg_c_bool_param_supported(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS))
-    jpeg_c_set_bool_param(&cinfo, JBOOLEAN_USE_MOZ_DEFAULTS, TRUE);
-
   cinfo.image_width = luma_width;
   cinfo.image_height = luma_height;
   cinfo.input_components = 3;