Imported Debian patch 0.4.27-2.3