Do it properly and you can upstream your patch.
Been there, done that, getting a simple patch for an actual bug upstreamed takes forever, can't be bothered.