I'm reopening this ticket because the fix that was committed has side-effects described in bug #1215520, so I'm reverting that change.
I'm reopening this ticket because the fix that was committed has side-effects described in bug #1215520, so I'm reverting that change.