Reviewed bug 1005377