Revert "[BUGFIX] Missing renames of addClass and removeClass"