Fix for SF 777848.

I've been bitten by this myself in the past half year.
I hope this fix is right.
I'll backport this to 2.3.