Match BeanStalk.

Change-Id: Ic345838d42407d64e01e47e17e859d07f0f6b6f3