If it is that simple I really do not understand why this is not upstream. o.O
It might have unwanted side-effects - I am not sure. Anyway for me it works.