This is a pretty egregious error; I'm surprised it has lasted so long! Fixes Trac #7124 MERGED from commit bdce8f0a