Comment 1 for bug 607674

Jono tried to address this, and it looked good to me. Maris tried to address this last week, and discovered a reason why what we had before would not have been sufficient. Maris, are those changes rolled out?