Suspending this for now - just adding it back to core xbrowse code