Revert behaviour of gremlin, and possible fix