Cherrypick bug 886329 to Beta/Firefox24