Revert "The Big Bad Guy Commit"

This reverts commit 24364fb64a96628d75f86c0fc38d61ee5648587f.
Revert "Revert "The Big Bad Guy Commit""

This reverts commit 6d7e42c15b65e2cb920ef6dfe3238ced0ed35630.
This time for real

I screwed up the first commits, lost some of my work in sync
shenanigans.