Workaround for Bug 1032798