Broke a lot of stuff and didn't fix anything.

This reverts commit 3c461eec, reversing
changes made to 884dd175.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>