Workaround bug 1007595