Workaround for bug 702953?