--- include/mach/i386/thread_status.h.orig
+++ include/mach/i386/thread_status.h
@@ -115,9 +115,6 @@
 #define x86_AVX_STATE32			16
 #define x86_AVX_STATE64			(x86_AVX_STATE32 + 1)
 #define x86_AVX_STATE			(x86_AVX_STATE32 + 2)
-#define x86_AVX512_STATE32		19
-#define x86_AVX512_STATE64		(x86_AVX512_STATE32 + 1)
-#define x86_AVX512_STATE		(x86_AVX512_STATE32 + 2)
 
 /*
  * Largest state on this machine:
@@ -147,9 +144,6 @@
 	  (x == x86_AVX_STATE32)	|| \
 	  (x == x86_AVX_STATE64)	|| \
 	  (x == x86_AVX_STATE)		|| \
-	  (x == x86_AVX512_STATE32)	|| \
-	  (x == x86_AVX512_STATE64)	|| \
-	  (x == x86_AVX512_STATE)	|| \
 	  (x == THREAD_STATE_NONE))
 
 struct x86_state_hdr {
@@ -193,10 +187,6 @@
 #define x86_AVX_STATE32_COUNT ((mach_msg_type_number_t) \
 		(sizeof(x86_avx_state32_t)/sizeof(unsigned int)))
 
-typedef _STRUCT_X86_AVX512_STATE32 x86_avx512_state32_t;
-#define x86_AVX512_STATE32_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_avx512_state32_t)/sizeof(unsigned int)))
-
 /*
  * to be deprecated in the future
  */
@@ -228,10 +218,6 @@
 #define x86_AVX_STATE64_COUNT ((mach_msg_type_number_t) \
 		(sizeof(x86_avx_state64_t)/sizeof(unsigned int)))
 
-typedef _STRUCT_X86_AVX512_STATE64 x86_avx512_state64_t;
-#define x86_AVX512_STATE64_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_avx512_state64_t)/sizeof(unsigned int)))
-
 typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
 #define x86_EXCEPTION_STATE64_COUNT	((mach_msg_type_number_t) \
     ( sizeof (x86_exception_state64_t) / sizeof (int) ))
@@ -287,14 +273,6 @@
 	} ufs;
 };
 
-struct x86_avx512_state {
-	x86_state_hdr_t			ash;
-	union {
-		x86_avx512_state32_t	as32;
-		x86_avx512_state64_t	as64;
-	} ufs;
-};
-
 typedef struct x86_thread_state x86_thread_state_t;
 #define x86_THREAD_STATE_COUNT	((mach_msg_type_number_t) \
 		( sizeof (x86_thread_state_t) / sizeof (int) ))
@@ -315,10 +293,6 @@
 #define x86_AVX_STATE_COUNT ((mach_msg_type_number_t) \
 		(sizeof(x86_avx_state_t)/sizeof(unsigned int)))
 
-typedef struct x86_avx512_state x86_avx512_state_t;
-#define x86_AVX512_STATE_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_avx512_state_t)/sizeof(unsigned int)))
-
 /*
  * Machine-independent way for servers and Mach's exception mechanism to
  * choose the most efficient state flavor for exception RPC's: