Revert "Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into patch-1"

This reverts commit 56e0ab6a303e94ca171408ac52f03c5b329f0c25, reversing
changes made to 87f7098dd470ffbf480eb65f6f4d343babaf9d08.