Per Catrope's request, commiting patch on bug 16018: