Wip 9284

I can't understand this change. I think the original code is correct.