backport 1334776

We'd like to backport Mozilla's 1334776