Reviewed bug 1083142