Comment 3 for bug 383255

Mat: See upstream bug for an explanation of the problems behind this seemingly trivial improvement.