Imported Debian patch 2.7.1-3