diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
index fdae41102b..ea4bb2cd54 100644
--- a/Source/Core/Common/ChunkFile.h
+++ b/Source/Core/Common/ChunkFile.h
@@ -41,14 +41,11 @@
 
 #if (__has_feature(is_trivially_copyable) &&                                                       \
      (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||                                        \
-    (defined(__GNUC__) && __GNUC__ >= 5)
+    (defined(__GNUC__) && __GNUC__ >= 5) || defined(_MSC_VER)
 #define IsTriviallyCopyable(T)                                                                     \
   std::is_trivially_copyable<typename std::remove_volatile<T>::type>::value
 #elif __GNUC__
 #define IsTriviallyCopyable(T) std::has_trivial_copy_constructor<T>::value
-#elif _MSC_VER
-// (shuffle2) see https://github.com/dolphin-emu/dolphin/pull/2218
-#define IsTriviallyCopyable(T) 1
 #else
 #error No version of is_trivially_copyable
 #endif