Revert GameVersion + refactor b48d1d9