Fixes the regression reported in bug 927137.
arm64 done
arm done
ppc done
ppc64 done
sparc done
x86 done
amd64 done all arches done