Bug 891123 - Apply upstream changeset r8599 which fixes the infinite recursion issue r=mettwoodrow