Revert messed up code (that's what you get for locally copying files instead of using git)