Graph service: remove decorator pattern.
Merge pull request #1172 from laurentg/upstream

Graph service: remove decorator pattern.