diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
index 8602d676ef..d6c0b3f583 100644
--- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
+++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/annotation/Waiter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.integration.samples.cafe.Drink;
 @MessageEndpoint
 public class Waiter {
 
-    @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries", timeout = 5 * 60 * 1000)
+    @Aggregator(inputChannel = "preparedDrinks", outputChannel = "deliveries")
     public Delivery prepareDelivery(List<Drink> drinks) {
         return new Delivery(drinks);
     }