diff --git a/src/cell.c b/src/cell.c
index 77b46f2ca85274aa2de5cd5ec15eeac4efa15a43..eed219e0c9977d5f416f3725012ee954160e5f95 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -2138,7 +2138,7 @@ void cell_clear_drift_flags(struct cell *c, void *data) {
  * @brief Clear the limiter flags on the given cell.
  */
 void cell_clear_limiter_flags(struct cell *c, void *data) {
-  c->hydro.do_limiter = 0;
+  cell_clear_flag(c, cell_flag_do_hydro_limiter);
   c->hydro.do_sub_limiter = 0;
 }
 
@@ -2295,10 +2295,10 @@ void cell_activate_drift_spart(struct cell *c, struct scheduler *s) {
 void cell_activate_limiter(struct cell *c, struct scheduler *s) {
 
   /* If this cell is already marked for limiting, quit early. */
-  if (c->hydro.do_limiter) return;
+  if (cell_get_flag(c, cell_flag_do_hydro_limiter)) return;
 
   /* Mark this cell for limiting. */
-  c->hydro.do_limiter = 1;
+  cell_set_flag(c, cell_flag_do_hydro_limiter);
 
   /* Set the do_sub_limiter all the way up and activate the super limiter
      if this has not yet been done. */
diff --git a/src/cell.h b/src/cell.h
index 3f351ffda10650b7ec318187c233f08fe04a4577..de624e204dacd39e1f3af5b6d10a6c2b42e6d12f 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -226,8 +226,8 @@ enum cell_flags {
   cell_flag_do_hydro_drift = (1UL << 1),
   cell_flag_do_hydro_sub_drift = (1UL << 2),
   cell_flag_do_hydro_sub_sort = (1UL << 3),
-  cell_flag_do_limiter = (1UL << 4),
-  cell_flag_do_sub_limiter = (1UL << 5),
+  cell_flag_do_hydro_limiter = (1UL << 4),
+  cell_flag_do_hydro_sub_limiter = (1UL << 5),
   cell_flag_do_grav_drift = (1UL << 6),
   cell_flag_do_grav_sub_drift = (1UL << 7),
   cell_flag_do_stars_sub_sort = (1UL << 8),
@@ -382,9 +382,6 @@ struct cell {
     /*! Bit-mask indicating the sorted directions */
     unsigned int sorted;
 
-    /*! Does this cell need to be limited? */
-    char do_limiter;
-
     /*! Do any of this cell's sub-cells need to be limited? */
     char do_sub_limiter;
 
diff --git a/src/runner.c b/src/runner.c
index 4a3019e02b7e1a92ce3b1303df35cc3a305a16ea..113aa4753a89304b69d0c20dc7ca2faf83506dd2 100644
--- a/src/runner.c
+++ b/src/runner.c
@@ -2865,13 +2865,13 @@ void runner_do_limiter(struct runner *r, struct cell *c, int force, int timer) {
                 ti_gravity_beg_max = 0;
 
   /* Limit irrespective of cell flags? */
-  force |= c->hydro.do_limiter;
+  force |= cell_get_flag(c, cell_flag_do_hydro_limiter);
 
   /* Early abort? */
   if (c->hydro.count == 0) {
 
     /* Clear the limiter flags. */
-    c->hydro.do_limiter = 0;
+    cell_clear_flag(c, cell_flag_do_hydro_limiter);
     c->hydro.do_sub_limiter = 0;
     return;
   }
@@ -2967,7 +2967,7 @@ void runner_do_limiter(struct runner *r, struct cell *c, int force, int timer) {
   }
 
   /* Clear the limiter flags. */
-  c->hydro.do_limiter = 0;
+  cell_clear_flag(c, cell_flag_do_hydro_limiter);
   c->hydro.do_sub_limiter = 0;
 
   if (timer) TIMER_TOC(timer_do_limiter);
diff --git a/src/space.c b/src/space.c
index 64630008ba32a90e551b7c7dfe0f0c2c4758bb83..c31d2dfbd46524ac9512ba192c48cb6c822b7a6f 100644
--- a/src/space.c
+++ b/src/space.c
@@ -263,7 +263,6 @@ void space_rebuild_recycle_mapper(void *map_data, int num_elements,
     c->stars.do_sub_drift = 0;
     c->black_holes.do_sub_drift = 0;
     c->hydro.do_sub_limiter = 0;
-    c->hydro.do_limiter = 0;
     c->hydro.ti_end_min = -1;
     c->hydro.ti_end_max = -1;
     c->grav.ti_end_min = -1;
@@ -3328,7 +3327,6 @@ void space_split_recursive(struct space *s, struct cell *c,
       cp->stars.do_sub_drift = 0;
       cp->black_holes.do_sub_drift = 0;
       cp->hydro.do_sub_limiter = 0;
-      cp->hydro.do_limiter = 0;
 #ifdef WITH_MPI
       cp->mpi.tag = -1;
 #endif  // WITH_MPI