Applying villager bugfix from original FML.