Revert "Some cool stuff without using deprecated methods/magic values :)"

This reverts commit 577080474fb956e1641c6088e5c81ff14cf13b6b.