Second debugging patch for bug 968200