Revert "Trying to fix this bullshit"

This reverts commit 2882f6da8ce50cc54599ff66707eb50530691d76.