Revert 01ad7e1..e82a7db

This rolls back to commit 01ad7e108bbe656ed7dde2f17ac8fef3374c3fc7.
It's all working now -- just need to adjust stuff.