Geometrodynamics regained