Revert "Undo most of a48fc0f and instead fix ec8c0e0 to properly handle rabbit chase games."

This reverts commit 74876f1fac45a7b4658f00a2c10f231414dc4e2c.