Discard previously-discarded messages correctly
Merge bug25624