diff --git a/mods/ENVIRONMENT/mcl_weather/rain.lua b/mods/ENVIRONMENT/mcl_weather/rain.lua
index a6845538d..3875e4324 100644
--- a/mods/ENVIRONMENT/mcl_weather/rain.lua
+++ b/mods/ENVIRONMENT/mcl_weather/rain.lua
@@ -175,7 +175,7 @@ function mcl_weather.rain.make_weather()
 
 	for _, player in pairs(get_connected_players()) do
 		local pos=player:get_pos()
-		if mcl_player.is_head_in_water(player) or not mcl_weather.has_rain(pos) then
+		if minetest.get_item_group(mcl_playerinfo[player:get_player_name()].head_submerged_in, "water") ~= 0 or not mcl_weather.has_rain(pos) then
 			mcl_weather.rain.remove_sound(player)
 			mcl_weather.remove_spawners_player(player)
 			if mcl_worlds.has_weather(pos) then
diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
index 065d21770..646bef22d 100644
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@@ -9,7 +9,7 @@ local mg_name = minetest.get_mapgen_setting("mg_name")
 
 function mcl_weather.set_sky_box_clear(player, sky, fog)
 	local pos = player:get_pos()
-	if mcl_player.is_head_in_water(player) then return end
+	if minetest.get_item_group(mcl_playerinfo[player:get_player_name()].head_submerged_in, "water") ~= 0 then return end
 	local sc = {
 			day_sky = "#7BA4FF",
 			day_horizon = "#C0D8FF",
@@ -39,7 +39,7 @@ end
 
 function mcl_weather.set_sky_color(player, def)
 	local pos = player:get_pos()
-	if mcl_player.is_head_in_water(player) then return end
+	if minetest.get_item_group(mcl_playerinfo[player:get_player_name()].head_submerged_in, "water") ~= 0 then return end
 	player:set_sky({
 		type = def.type,
 		sky_color = def.sky_color,
diff --git a/mods/HUD/hudbars/init.lua b/mods/HUD/hudbars/init.lua
index 0ab895873..7c69c03eb 100644
--- a/mods/HUD/hudbars/init.lua
+++ b/mods/HUD/hudbars/init.lua
@@ -556,7 +556,7 @@ local function do_breath_tick(player, dtime)
 
 	local breath_max = hb.settings.breath_max
 	local player_name = player:get_player_name()
-	local in_water = mcl_player.is_head_in_water(player)
+	local in_water = minetest.get_item_group(mcl_playerinfo[player_name].head_submerged_in, "water") ~= 0
 	local current_breath = hb.get_breath(player)
 
 	local helmet = player:get_inventory():get_stack("armor", 2)
diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua
index ac2fad179..5a0f97a48 100644
--- a/mods/PLAYER/mcl_player/init.lua
+++ b/mods/PLAYER/mcl_player/init.lua
@@ -187,15 +187,6 @@ function mcl_player.player_set_animation(player, anim_name, speed)
 	player:set_animation(anim, speed or model.animation_speed, animation_blend)
 end
 
-
-function mcl_player.is_head_in_water(player)
-	--return minetest.get_item_group(mcl_playerinfo[player:get_player_name()].node_head, "water") ~= 0
-	local name = player:get_player_name()
-	local submerged_liquid = mcl_playerinfo[name].head_submerged_in
-	if submerged_liquid == nil then return end
-	return minetest.get_item_group(submerged_liquid, "water")
-end
-
 -- Update appearance when the player joins
 minetest.register_on_joinplayer(function(player)
 	local name = player:get_player_name()
@@ -246,7 +237,7 @@ minetest.register_globalstep(function(dtime)
 			end
 
 			-- ask if player is swiming
-			local head_in_water = mcl_player.is_head_in_water(player)
+			local head_in_water = minetest.get_item_group(mcl_playerinfo[name].head_submerged_in, "water") ~= 0
 			-- ask if player is sprinting
 			local is_sprinting = mcl_sprint.is_sprinting(name)
 
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index a6915b866..25d8ad9f0 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -619,7 +619,7 @@ minetest.register_globalstep(function(dtime)
 		end
 
 		-- Underwater: Spawn bubble particles
-		if mcl_player.is_head_in_water(player) then
+		if get_item_group(mcl_playerinfo[name].head_submerged_in, "water") ~= 0 then
 			add_particlespawner({
 				amount = 10,
 				time = 0.15,