Reapply a modified r18883 patch (by Thomas Weidenmueller) that doesn't break named...