Mobs riding mobs dismount in water deeper than 2 blocks

Mobs riding mobs (spider jockey, chicken jockey, etc.) will dismount underwater. It's difficult to keep them riding each other in wet places.

To reproduce:
1. Spawn a riding mob
2. Throw it into deep water
3. Mobs will dismount