Comment 20 for bug 63450

I believe this change is correct (and necessary), but I wouldn't like to be both the sponsor and the reviewer this close to release. Michael, does this look ok to you, or do you have concerns about a hal restart on the upgrade path, which I guess may be what Daniel was suggesting?