Zombie/skeleton/drowner AI bug

Using a mob farm with zombies and skeletons, when near a player but also being pushed by water, half of the zombies, drowners, and skeletons face the water pushing them and try to move that way instead of facing the opposite direction towards the player and trying to move towards the player.