Revert errored merge of deea30d

Revert "Merge branch 'master' of https://github.com/farias-r7/metasploit-framework into upstream-master"

This reverts commit deea30ddb4b814c2b0075df3bc1fa52d41ff2d81, reversing
changes made to 14514d7b8b65489066b978311e7be40b61ec543d.
Land #4175, revert of deea30d