Btw, could we restrict this kludge to platforms that need it? See attached patch.
I like the idea, slightly different patch is in. Petr