Reversing a commit that messed up a the defaults in the classes.