Revert "Merge branch 'master' into MainUI"

This reverts commit b29f2442824e9d4901073fc2ed6495feb575d211, reversing
changes made to 381a1a74e1669807c3a021c2bf4ca9c5cf641610.
Fixed compile time error

Added function contained various errors, function was removed
Merge
Fixed lots of stuff...

Somehow shit got broken, it's 2:33 AM, so I fixed it. I'll just leave
it at that