Sync risaacson to eucalyptus.

This ends up just adding in Ken's request.