Apply fix from bug 968222