IMO this should be removed entirely if we're going to remove the browser special-case