Water not rendering when underwater

When underwater, or inside a water block, the surface water texture does not render anymore like it should. Note that this is present with lava as well. Most likely a side effect of the fix to MC-34649.