Re-Fixed the revented commit issue

Re-fix (yes, I'm really bad at this git thing...) my previous messed up
commit.