Game Engine Commit, mostly
Revert "Game Engine Commit, mostly"

This reverts commit e276450a5e9bff5267fd5cbceb206e8d66e74e74.