Revert "Changes for beanstalk"

This reverts commit f788b935e9300cf9b4ca1670d413cf57e3b8fe7b.