Can someone please review the proposed solution to bug #663074? If accepted, should it be backported to 2.2.3 as well? -- Gustavo Niemeyer [ 2AAC 7928 0FBF 0299 5EB5 60E2 2253 B29A 6664 3A0C ]