Reverting "Respect --browser-types option"