Troubled Waters: Rethinking the Theology of Baptism