Keep using the existing 386 and amd64 code on those archs, since it is more efficient. From-SVN: r212853