Revert "Some magical tweaks thx Googy Anas"

This reverts commit 87aa801c685edf76a282d1a56d0975490899e2d6.