Revert "Merge branch 'master' of https://github.com/MrXors/metasploit-framework"

This reverts commit 06ee2ec0afd89f5ce9b367f8169c5f774ff47117, reversing
changes made to 49c629be5ab897409db233504a35a4e5ba51d728.