Revert 7794a0c..7d32b27

This rolls back to commit 7794a0c233fc2a45b6e00df623ca204ee992a5ab.
Troubleshooting...

Still not sure what the problem is. It should be working, but for some
reason Brian's versions work when sourced from the desktop, but not
from my directory.