Let's try raven02's #2880, which failed to merge normally so I did it manually instead.