Revert "Some strange changes, that i didn't do"

This reverts commit e3d6b0cb268ef2ad5d8daa0a93fd247ecaf64876.