diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
index c8f554d03dd..65d5d8ebd9b 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java
@@ -16,12 +16,18 @@
 
 package org.springframework.bootstrap.context.embedded;
 
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
 /**
  * Strategy interface for customizing auto-configured embedded servlet containers. Any
  * beans of this type will get a callback with the container factory before the container
- * itself is started, so you can set the port, address, error pages etc. Beware: will be
- * called from a BeanPostProcessor (so very early in the ApplicationContext lifecycle), so
- * it might be safer to lookup dependencies lazily in the enclosing BeanFactory rather
+ * itself is started, so you can set the port, address, error pages etc.
+ * 
+ * <p>
+ * Beware: calls to this interface are usually made from a
+ * {@link EmbeddedServletContainerCustomizerBeanPostProcessor} which is a
+ * {@link BeanPostProcessor} (so called very early in the ApplicationContext lifecycle).
+ * It might be safer to lookup dependencies lazily in the enclosing BeanFactory rather
  * than injecting them with <code>@Autowired</code>.
  * 
  * @author Dave Syer
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
index 32f876678a1..04eed37f74a 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
@@ -37,9 +37,6 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 public class EmbeddedServletContainerCustomizerBeanPostProcessor implements
 		BeanPostProcessor, ApplicationContextAware {
 
-	// FIXME should we register this by default, Javadoc in
-	// EmbeddedServletContainerCustomizer suggests so
-
 	private ApplicationContext applicationContext;
 
 	private List<EmbeddedServletContainerCustomizer> customizers;