This reverts commit 496e485691. Undo overly large set of changes -- LLVM wasn't ready. Tom can recommit just the zsh stuff.
496e485691