Revert "Land #2505" to resolve new rspec fails

This reverts commit 717dfefead2da17245d1d9d1a44a0738e55347cf, reversing
changes made to 6430fa335464a334a76e4681579658279a407e3f.
Land #2556, msfcli rspec failures fix for #2505