Revert changes to GraphX - they will go into a future change