Revert "e all over again."

This reverts commit dd0e2c42e67b26c5bac39789e97e1371a8f1650b.
EDITOR=emacs