Merge 1.6.4 hack for synchronicity to handle too many use / attack
events.