Workaround for bug 984928