Including the patch file to keep it around for future upstream merges