This reverts commit e04e5c10da. There were zero functional changes in the release and it now depends on non-portable stuff, which breaks build outside x86/arm
e04e5c10da