Workaround for bug 837029