Water messes up zombie AI

When transported by water, zombies seem to track some random point in the distance and ignore everything else.

Look at the screenshots, where both zombies and baby zombies ignore the villager after taking a little swim. Even if they somehow get pushed towards the villager they will not attack it.
They will still attack a player in survival mode though.

This could be a result of the efforts to fix MC-90691.