Revert "Funky changes out of nowhere"

This reverts commit f277ac48ec9628d431d70510cfe17c8b4af7ab11.