This reverts commit 41905ee4, reversing changes made to 35145bd5. It causes regressions in several games.