Done when performing general class refactoring in #850