diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc
index 76a62399d6ea..9c255db5fb27 100644
--- a/atom/app/atom_main.cc
+++ b/atom/app/atom_main.cc
@@ -34,7 +34,7 @@
 
 namespace {
 
-const auto kRunAsNode = "ELECTRON_RUN_AS_NODE";
+const char* kRunAsNode = "ELECTRON_RUN_AS_NODE";
 
 bool IsEnvSet(const char* name) {
 #if defined(OS_WIN)
@@ -56,30 +56,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 
   bool run_as_node = IsEnvSet(kRunAsNode);
 
-#ifdef _DEBUG
-  // Don't display assert dialog boxes in CI test runs
-  static const auto kCI = "ELECTRON_CI";
-  bool is_ci = IsEnvSet(kCI);
-  if (!is_ci) {
-    for (int i = 0; i < argc; ++i) {
-      if (!_wcsicmp(wargv[i], L"--ci")) {
-        is_ci = true;
-        _putenv_s(kCI, "1");  // set flag for child processes
-        break;
-      }
-    }
-  }
-  if (is_ci) {
-    _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-    _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
-
-    _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE);
-    _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-
-    _set_error_mode(_OUT_TO_STDERR);
-  }
-#endif
-
   // Make sure the output is printed to console.
   if (run_as_node || !IsEnvSet("ELECTRON_NO_ATTACH_CONSOLE"))
     base::RouteStdioToConsole(false);
diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index 83406e4c8e0b..c0dc92b98c16 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -92,6 +92,8 @@
       'Common_Base': {
         'abstract': 1,
         'defines': [
+          # We are using Release version libchromiumcontent:
+          'NDEBUG',
           # Needed by gin:
           'V8_USE_EXTERNAL_STARTUP_DATA',
           # From skia_for_chromium_defines.gypi:
@@ -187,7 +189,6 @@
           # Use this instead of "NDEBUG" to determine whether we are in
           # Debug build, because "NDEBUG" is already used by Chromium.
           'DEBUG',
-          '_DEBUG',
           # Require when using libchromiumcontent.
           'COMPONENT_BUILD',
           'GURL_DLL',
@@ -197,32 +198,15 @@
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
-            'RuntimeLibrary': '3',  # /MDd (debug DLL)
+            'RuntimeLibrary': '2',  # /MD (nondebug DLL)
             'Optimization': '0',  # 0 = /Od
             # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx
             'BasicRuntimeChecks': '3',  # 3 = all checks enabled, 0 = off
           },
-          'VCLinkerTool': {
-            'OptimizeReferences': 2, # /OPT:REF 
-            'EnableCOMDATFolding': 2, # /OPT:ICF
-          },
         },
-        'conditions': [
-          ['OS=="linux"', {
-            'defines': [
-              '_GLIBCXX_DEBUG',
-            ],
-            'cflags': [
-              '-g',
-            ],
-          }],  # OS=="linux"
-        ],
       },  # Debug_Base
       'Release_Base': {
         'abstract': 1,
-        'defines': [
-          'NDEBUG',
-        ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'RuntimeLibrary': '2',  # /MD (nondebug DLL)
diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent
index 7d889fde3b5c..8cfd08f84e41 160000
--- a/vendor/libchromiumcontent
+++ b/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit 7d889fde3b5c7083c554675c97142547d7605057
+Subproject commit 8cfd08f84e415f3c8e5fde061f8e17400ef8aa7f