Reverted AVX-changes