Use the new AdvertisedDataSource class.
Commit 77da46a84ddce53d91f4964c9ed71f6442ba93ec made it
into its own class.