Revert ce77f450f266dbeb93939a549a6ab879fc69d751 and f97cf27e7285351f656b3e147e8fa379ffb2425b
Cave in and use the suggested encounterID

Should fix #8