Merge "Remove accidental re-addition of factored-out cruft." into main