Folowup patch for Bug 979696