Revert "Merge branch 'mergeGameFlow'"

This reverts commit 512c5992e0a0d53497717fec92b785b8e5d5c02d, reversing
changes made to 192abdefda6ba23f88db0ac03262827fc32d3e29.