Revert "Don't unregister MobModule after a match"

This reverts commit 37cd4b27427e8fc60b3c4b50379ac4442c7744d3.