Redefining Water Infrastructure for the 21st Century