Reviewed bug 1015242