Reviewed bug 1088905