Testing found a few games that did some crazy things which breaks the assumptions made in that commit.