Revert "Merge branch 'team9dev' into closeGame"

This reverts commit b069df88cc5b90f60e4a517cfb9a31027cf37272, reversing
changes made to b28ab262e94102b3179b611fe3431cb6cf7396e8.