Bug 24130: (RM follow-up) Fix old invalid data