Revert "Land #2505" to resolve new rspec fails

This reverts commit 717dfefead2da17245d1d9d1a44a0738e55347cf, reversing
changes made to 6430fa335464a334a76e4681579658279a407e3f.

For information on how to reintroduce this merge to fix the actual problem, see:

http://git-scm.com/2010/03/02/undoing-merges.html

Feel free to close this without merging if you can resolve the actual problem quickly*.

## Verification

 - [ ] Land this PR
 - [ ] Run `rspec spec/msfcli_spec.rb `
 - [ ] See the results: `Finished in 1 minute 16.63 seconds | 38 examples, 0 failures`

`*` Quickly, in this case, is something less than an hour.