Resubmitted patch for bug 999550