Revert magic 'class' method, just replace class completely instead of adding class, less confusing