that way we don't have to handle it all over the place (which we didn't, which made the chooser dysfunctional). BUG: 281862 (cherry picked from commit a4ef19c9)