Workaround for bug 2870?