Fixes #7903 - Remove call to undefined class