Broke a lot of stuff and didn't fix anything. This reverts commit 3c461eecd48ba2cf7616d98e6f99954de3ad4b06, reversing changes made to 884dd175f0. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
884dd175f0