Revert "Redo the extractor code"

This reverts commit acd541e092d7efb5d9fe91d7303af14afa78dcc0.