Merge pull request #129 from wikimedia/he7d3r-extractor-and-reverts