Revert "Autistic fixes no one will care about"

This reverts commit a73755e633f732715ceec503fb3d6fbb21050ecc.