Fixes annotations to work with one data server.

I broke annotations by not updating them to reflect the new ways data is
retrieved (bad fhats!). This is a shim to make annotations work with one
data server; more work will be required to allow annotations to work with
all data servers in the graph.