Just before link class refactoring.