We have always used the oil based product and have been very happy with it. Since it was unavailable, we ordered the water-based, and wow. I had to take a shower immediately because of the burning sensation. Never had that reaction before. Please bring back the good stuff!