r6880 accidentally backed out r6780. That's what I get for accepting