diff --git a/ai.c b/ai.c
index 0014f075c1..edc7b27033 100644
--- a/ai.c
+++ b/ai.c
@@ -116,7 +116,7 @@ static void AiStateVehLoop(Player *p)
 	p->ai.state_counter = 0;
 }
 
-static int AiChooseTrainToBuild(byte railtype, int32 money, byte flag)
+static int AiChooseTrainToBuild(byte railtype, int32 money, byte flag, TileIndex tile)
 {
 	int best_veh_index = -1;
 	byte best_veh_score = 0;
@@ -131,7 +131,7 @@ static int AiChooseTrainToBuild(byte railtype, int32 money, byte flag)
 		    || !HASBIT(e->player_avail, _current_player) || e->reliability < 0x8A3D)
 			continue;
 
-		r = DoCommandByTile(0, i, 0, 0, CMD_BUILD_RAIL_VEHICLE);
+		r = DoCommandByTile(tile, i, 0, 0, CMD_BUILD_RAIL_VEHICLE);
 		if (r != CMD_ERROR &&
 					(!(_cmd_build_rail_veh_var1&1) || !(flag&1)) &&
 					r <= money &&
@@ -238,7 +238,7 @@ static int AiChooseTrainToReplaceWith(Player *p, Vehicle *v)
 	}
 
 	// XXX: check if a wagon
-	return AiChooseTrainToBuild(v->u.rail.railtype, avail_money, 0);
+	return AiChooseTrainToBuild(v->u.rail.railtype, avail_money, 0, v->tile);
 }
 
 static int AiChooseShipToReplaceWith(Player *p, Vehicle *v)
@@ -2393,7 +2393,7 @@ static void AiStateBuildRailVeh(Player *p)
 	}
 
 	// Which locomotive to build?
-	veh = AiChooseTrainToBuild(p->ai.railtype_to_use, p->player_money, (cargo!=CT_PASSENGERS)?1:0);
+	veh = AiChooseTrainToBuild(p->ai.railtype_to_use, p->player_money, (cargo!=CT_PASSENGERS)?1:0, tile);
 	if (veh == -1) {
 handle_nocash:
 		// after a while, if AI still doesn't have cash, get out of this block by selling the wagons.
diff --git a/train_cmd.c b/train_cmd.c
index 2ab61e49e2..bc9ef02b8f 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -528,11 +528,9 @@ int32 CmdBuildRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	if (!IsEngineBuildable(p1, VEH_Train)) return CMD_ERROR;
 
-	/* NOTE: The AI sends build engine commands without DC_EXEC to figure out if
-	it can affort an engine before trying to buy it*/
-	if (!IsTrainDepotTile((TileIndex)tile) && flags & DC_EXEC) return CMD_ERROR;
+	if (!IsTrainDepotTile((TileIndex)tile)) return CMD_ERROR;
 
-	if (_map_owner[tile] != _current_player && flags & DC_EXEC) return CMD_ERROR;
+	if (_map_owner[tile] != _current_player) return CMD_ERROR;
 
 	_cmd_build_rail_veh_var1 = 0;