CRM-14091 - this commit didn't wind up in 4.4