Bug 984237 workaround