Bug 909201 proposed fix.