Revert classversion.
Merge pull request #4335 from ktf/fix-classversion

Revert classversion.