Revert "Trimmed down to just what I want"

This reverts commit f1810c279227317d4ef56f8cfff7b55eb6cf3b90.