revert r77790. it requires a new-style class change
4 files changed