Revert "DATAGRAPH-454"

This reverts commit 4bcf040527212bd963db18e2dae760f58245d204.