[Bug 247476] Changed upstream...