Reviewed bug 1097032