6.x-2.9
5dba020f · Partly reverse earlier patch. ·