Fix from BeanStalk.

Change-Id: Icff36a2b694835086e58b94de995428546143e49