Revert "Anthony... I kinda broke stuff I'm drunk as hell :beers:"

This reverts commit 299f03adf9a3eb24c9cd4e0e6e43a98558fc2af1.