This change has been done for Fennec a few months ago in bug 1367912. MozReview-Commit-ID: G184WhY2nik