Re-fixup for bug 925605