diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp
index b7cad0035972..83d6061ddf6f 100644
--- a/src/replay_controller.cpp
+++ b/src/replay_controller.cpp
@@ -76,9 +76,8 @@ replay_controller::replay_controller(const config& level,
 		game_state& state_of_game, const int ticks,
 		const config& game_config, CVideo& video) :
 	play_controller(level, state_of_game, ticks, game_config, video, false),
-	teams_start_(gameboard_.teams_),
 	gamestate_start_(gamestate_),
-	units_start_(gameboard_.units_),
+	gameboard_start_(gameboard_),
 	tod_manager_start_(level),
 	current_turn_(1),
 	is_playing_(false),
@@ -272,9 +271,8 @@ void replay_controller::reset_replay()
 	tod_manager_= tod_manager_start_;
 	recorder.start_replay();
 	recorder.set_skip(false);
-	gameboard_.units_ = units_start_;
 	gamestate_ = gamestate_start_;
-	gameboard_.teams_ = teams_start_;
+	gameboard_ = gameboard_start_;
 	if (events_manager_ ){
 		// NOTE: this double reset is required so that the new
 		// instance of game_events::manager isn't created before the
diff --git a/src/replay_controller.hpp b/src/replay_controller.hpp
index 8e168f5d91ab..e4c58276008e 100644
--- a/src/replay_controller.hpp
+++ b/src/replay_controller.hpp
@@ -52,8 +52,6 @@ class replay_controller : public play_controller
 	virtual void check_end_level() {}
 	virtual void on_not_observer() {}
 
-	std::vector<team> teams_start_;
-
 	bool manage_noninteractively();
 
 protected:
@@ -87,7 +85,7 @@ class replay_controller : public play_controller
 	}
 
 	game_state gamestate_start_;
-	unit_map units_start_;
+	game_board gameboard_start_;
 	tod_manager tod_manager_start_;
 
 	unsigned int current_turn_;