Does grace and faith by default do away with water?

Many people in the religious world contend that water has nothing to do with our salvation today because salvation from God comes by grace through faith. In other words, salvation by grace and faith, so it is thought, leaves no room or need for the water, but is that the case?

Did you know that Noah was saved by grace through faith and water? He sure was!

But Noah found grace in the eyes of the Lord.” (Genesis 6:8)

By faith Noah, being divinely warned of things not yet seen, moved with godly fear, prepared an ark for the saving of his household, by which he condemned the world and became heir of the righteousness which is according to faith.” (Hebrews 11:7)

who formerly were disobedient, when once the Divine longsuffering waited in the days of Noah, while the ark was being prepared, in which a few, that is, eight souls, were saved through water.” (1 Peter 3:20)

Now if God’s plan of salvation in the past could consist of saving someone by grace through faith and water, then what makes a person think that grace and faith does away with the water today?

There is also an antitype which now saves us—baptism (not the removal of the filth of the flesh, but the answer of a good conscience toward God), through the resurrection of Jesus Christ,” (1 Peter 3:21)