Revert "Merge branch '321650-mlunoe-migrate-step-components-to-use-local-graphql-state' into 'master'"

This reverts commit 4223146f, reversing
changes made to 8aa6760b.