Back out last patch, because it seems to have made tinderboxes fail on Windows. Sheriff Nelson
Back out last patch, because it seems to have made tinderboxes fail on
Windows. Sheriff Nelson

ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old