Comment 293 for bug 445852

MArtin, can you prep a patch for your requested changes?