diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
index 25e9a469f93b..fffbd12764b2 100644
--- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
@@ -32,7 +32,3 @@ vespa_add_library(searchcore_pcommon STATIC
     EXTERNAL_DEPENDS
     ${VESPA_STDCXX_FS_LIB}
 )
-
-if(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.2" OR VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8")
-  set_source_files_properties(hw_info_sampler.cpp PROPERTIES COMPILE_FLAGS -DRHEL_8_2_KLUDGE)
-endif()
diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
index ea2d2de8b415..2f054843dd3b 100644
--- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
@@ -165,16 +165,3 @@ HwInfoSampler::sampleDiskWriteSpeed(const vespalib::string &path, const Config &
 }
 
 }
-
-#ifdef RHEL_8_2_KLUDGE
-
-// Kludge to avoid unresolved symbols with gcc-toolset-9 on RHEL 8.2
-#include <codecvt>
-
-namespace std {
-
-template class codecvt_utf8<wchar_t>;
-
-}
-
-#endif