Switched back to old (thurst-less) idea