Things I shoulda done a while ago
Revert "Things I shoulda done a while ago"

This reverts commit 18740511e3399520e9fd27c5ce5a0da3ab9cc5f1.