Possible workabout for bug 10425