Villagers and iron golems count towards passive mobcap, breaking passive mob farms

In 1.14 (and possibly 1.14-pre1), villagers and iron golems count towards the passive mobcap. This isn't good, because it prevents other passive mobs (e.g. cows, chickens, etc.) from spawning. This also breaks passive mobfarms, a staple of technical minecraft.