This reverts commit 3bee6a4733, as the fix that will be used by upstream zsh folks should make it unnecessary.
3bee6a4733