Revert 3012916..90f5e0c

This rolls back to commit 3012916b1254b8eaa31aa2fded86144a3e09615a.
before GameModel OUT