Revert "Tweak GraphManager API for more flexibility". This was misguided
and needs addressing another way.

This reverts commit fd4492775542d1430ee265ff976e65556b395fb2.