Current natural=water scheme inconsistency

https://www.openstreetmap.org/user/BushmanK/diary/38396