Revert "Fix bugs of encounters"

This reverts commit 870df260dd879eea8041b1f54e1dce08ab45ff6d.