Revert since this was breaking on some archs... need to revisit arch detection code