Underwater Time

Underwater time extended but when the players head is out of the water damage does not keep going down.
I have considered removing the HeadVolume if from the player controller to look like this
line 4454:

if ( Pawn.PhysicsVolume.bWaterVolume )
{
Pawn.BreathTime = Pawn.UnderWaterTime;
NewState = Pawn.WaterMovementState;
}

but that does not seem to work.
So I have posted a post on the forums to see whether any one can help.