Add workaround for bug 923969