Partial fix for brave/brave-browser#5831