Revert "Fixed the shit"

This reverts commit 20c1fd3df2c0a50c81b09ff5a0e34d77bbc79981.
Fixed more shit
Revert "Fixed more shit"

This reverts commit fbbffe57d210e645458f555882081dfb4443142e.