Remove graph rewiring for now, since it's quite buggy. It will be
re-commited when ready.