This commit is causing abnormally long boot times in games. Could we get a fix, or if it will take a while, a revert until it's fixed. It's a bit ridiculous to be waiting nearly 20 seconds for game to start.