Fix bad merging of EntityEncoder. gitderp.