Unconflict rapid7/metasploit-framework#1421

This gets us back to a place where this thing can actually be reviewed. Sorry for the delay, I do love the WDS stuff.