Revert x86 sigcontext cleanups