Revert drop of non-deprecated classes