Fixed Crazy Merge/Revert Change

I don't even...at least it should be fixed now :D