Revert 48282, the missing class was added