Back out last change, since it introduced failures on all platforms but Linux.
Back out last change, since it introduced failures on all platforms but Linux.

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