Workaround bug 969860