Make the shell's -z option work again. bug 441361, r=crowder