1112210 rti issues

r?
don't we need to clear out `browser_data` if an exception is thrown here?