Comment 5 for bug 930115

Ondřej, thanks for diagnosing this issue! I'll review and incorporate your patch and release a regression fix for this shortly after testing locally.

Thanks and my apologies for introducing this regression.