[Bug 998858] Revert r173 in shells/zsh