Revert commit that went a bit overboard.

It is still available on branch extract.

This reverts commit 4305abd4a3946ff98807d4d79bf5236c9753d6ce.