Imported Debian patch 2.4.7-1ubuntu4