Fixes a serious regression from <1.7.0 (bug 922477).
ppc64 done
arm done
sparc done
arm64 done
amd64 done
x86 done
ppc done
hppa done, all done