Match BeanStalk.

Change-Id: I7c7458c22a9e8c3cc351d57d30f050d37f64c4b8