Quick fix for old-style class in released baseline