Revert "Use execute_successfully and combine steps"

This reverts commit d202dddd.

Conflicts:
	features/step_definitions/torified_misc.rb

Combining the steps doesn't make make sense without being able to use
execute_successfully.