diff --git a/core/dive.cpp b/core/dive.cpp
index 18a63bb3d..34de44de7 100644
--- a/core/dive.cpp
+++ b/core/dive.cpp
@@ -366,7 +366,7 @@ cylinder_t *dive::get_or_create_cylinder(int idx)
 		return NULL;
 	}
 	while (static_cast<size_t>(idx) >= cylinders.size())
-		add_empty_cylinder(&cylinders);
+		cylinders.emplace_back();
 	return &cylinders[idx];
 }
 
@@ -1075,7 +1075,7 @@ static void fixup_dc_sample_sensors(struct dive &dive, struct divecomputer &dc)
 
 	// Do we need to add empty cylinders?
 	while (sensor_mask) {
-		add_empty_cylinder(&dive.cylinders);
+		dive.cylinders.emplace_back();
 		sensor_mask >>= 1;
 	}
 }
diff --git a/core/equipment.cpp b/core/equipment.cpp
index bf8389474..f157815a4 100644
--- a/core/equipment.cpp
+++ b/core/equipment.cpp
@@ -363,12 +363,6 @@ void copy_cylinder_types(const struct dive *s, struct dive *d)
 		d->cylinders.push_back(s->cylinders[i]);
 }
 
-cylinder_t *add_empty_cylinder(struct cylinder_table *t)
-{
-	t->emplace_back();
-	return &t->back();
-}
-
 /* if a default cylinder is set, use that */
 void fill_default_cylinder(const struct dive *dive, cylinder_t *cyl)
 {
diff --git a/core/equipment.h b/core/equipment.h
index 5402032f8..247e108b4 100644
--- a/core/equipment.h
+++ b/core/equipment.h
@@ -72,7 +72,6 @@ using weightsystem_table = std::vector<weightsystem_t>;
 
 extern enum cylinderuse cylinderuse_from_text(const char *text);
 extern void copy_cylinder_types(const struct dive *s, struct dive *d);
-extern cylinder_t *add_empty_cylinder(struct cylinder_table *t);
 extern void remove_cylinder(struct dive *dive, int idx);
 extern void remove_weightsystem(struct dive *dive, int idx);
 extern void set_weightsystem(struct dive *dive, int idx, weightsystem_t ws);
diff --git a/core/parse.cpp b/core/parse.cpp
index d34cc8160..38846c79a 100644
--- a/core/parse.cpp
+++ b/core/parse.cpp
@@ -300,7 +300,8 @@ void picture_end(struct parser_state *state)
 
 cylinder_t *cylinder_start(struct parser_state *state)
 {
-	return add_empty_cylinder(&state->cur_dive->cylinders);
+	state->cur_dive->cylinders.emplace_back();
+	return &state->cur_dive->cylinders.back();
 }
 
 void cylinder_end(struct parser_state *state)