diff --git a/src/native/corehost/comhost/clsidmap.cpp b/src/native/corehost/comhost/clsidmap.cpp
index 5c17a7af86d9e5..978cdeddb104b2 100644
--- a/src/native/corehost/comhost/clsidmap.cpp
+++ b/src/native/corehost/comhost/clsidmap.cpp
@@ -11,9 +11,9 @@
 #include <wintrust.h>
 #include <Softpub.h>
 
+#include <json_parser.h>
 #include <external/rapidjson/document.h>
 #include <external/rapidjson/istreamwrapper.h>
-#include <json_parser.h>
 
 using comhost::clsid_map_entry;
 using comhost::clsid_map;
diff --git a/src/native/corehost/json_parser.h b/src/native/corehost/json_parser.h
index aa0b2ff7e626f7..2c2845aac46bfe 100644
--- a/src/native/corehost/json_parser.h
+++ b/src/native/corehost/json_parser.h
@@ -4,13 +4,9 @@
 #ifndef __JSON_PARSER_H__
 #define __JSON_PARSER_H__
 
-#ifdef __sun
-// This optimization relies on zeros in higher 16-bits, whereas SunOS has 1s. More details at
-// https://github.com/Tencent/rapidjson/issues/1596.
-// The impact here was that runtimeOptions key available in hwapp.runtimeconfig.json was not
-// located by RapidJson's FindMember() API from runtime_config_t::ensure_parsed().
+// Turn off flaky optimization. For details, see:
+// https://github.com/Tencent/rapidjson/issues/1596#issuecomment-548774663
 #define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
-#endif
 
 #include "pal.h"
 #include <external/rapidjson/document.h>