Revert "Merge branch 'extraction'"

This reverts commit 31eac9b593b04206406d2964b874bebac21ef83e, reversing
changes made to e6534a69d903de7a62fc8501163a038f1db5923e.