This is already in `hydro-devel`... This diff looks weird