b3399eb
Switch to the upstream patch for #1029110 Switch to the simplified version of the patch for #1029110 that ended up being committed upstream (RT#7764).