[KLS]

I'll commit the revert then, thanks.

Edit: Actually I changed it up a bit rather than a full revert because I realized a full revert would take out some required functionality... With any luck the crash will be gone and everything will work.