I do seriously hope that this goes into Diablo ....

and particularly for not so brave souls (like myself), where the new Nokia Diablo kernel comes with these fixes and R&R support.

But thanks nevertheless to you for this easy fix, once the kernel hack is applied.