Revert errored merge of deea30d

Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"

This merge looks like it was done in error, so revert it, please. Not sure what's fixed (or broken!) with this. See the comment on the commit, here: