Revert "updates from nueue/game-on"

This reverts commit e73d911d278b4578594a12040a8f23f00e31255d, reversing
changes made to f2b3441867e74ab00f93dc10c8176be95d10ac20.
Revert 06d60ab..bebf7e3

This rolls back to commit 06d60ab753f5a8cd2478dc18e5a8a74ee0f882b7.
Revert e73d911..89698a3

This rolls back to commit e73d911d278b4578594a12040a8f23f00e31255d.
Revert f2b3441..afcd58f

This rolls back to commit f2b3441867e74ab00f93dc10c8176be95d10ac20.
Revert "Revert f2b3441..afcd58f"

This reverts commit 04500e470f6e02a5529306cbd50aa0e0215de8d1.
Revert f2b3441..2ffd8c8

This rolls back to commit f2b3441867e74ab00f93dc10c8176be95d10ac20.