revert class differentiation, that was wrong