Fixing calabash acceptance tests
Revert "Fixing calabash acceptance tests"

This reverts commit bae8d08b1724c7ad9ff6bdb0c2eeafff683e622b.