Notably fixes a regression from 3.5 too.
arm done
amd64 stable
ppc64 stable
sparc stable
arm64 done
x86 stable
ppc done
hppa done all arches done