Fix merge conflict with current mozilla-central