Its probably best if I revert these changes from this module, and these comments should apply to https://github.com/rapid7/metasploit-framework/pull/2075 ?