diff --git a/src/droid.c b/src/droid.c
index f5570df60..1fa15f849 100644
--- a/src/droid.c
+++ b/src/droid.c
@@ -4588,31 +4588,18 @@ BOOL vtolHappy(const DROID* psDroid)
 	if (psDroid->numWeaps > 0)
 	{
 		unsigned int i;
-		bool numVtolWeaps[8];
-		bool rearmedWeaps[8];
-
-		memset(numVtolWeaps, 0, sizeof(numVtolWeaps));
-		memset(rearmedWeaps, 0, sizeof(rearmedWeaps));
 
 		for (i = 0; i < psDroid->numWeaps; ++i)
 		{
 			if (asWeaponStats[psDroid->asWeaps[i].nStat].vtolAttackRuns > 0)
 			{
-				numVtolWeaps[i] = true;
 				if (psDroid->sMove.iAttackRuns[i] == 0)
 				{
-					rearmedWeaps[i] = true;
+					return false;
 				}
 			}
 		}
 
-		for (i = 0; i < psDroid->numWeaps; ++i)
-		{
-			if (numVtolWeaps[i]
-			 && !rearmedWeaps[i])
-				return false;
-		}
-
 		return true;
 	}