This reverts commit 03dd03b8. The reverted commit contains an unrelated change: disabling the extension signing hacks. That was supposed to be in a separate commit, but it's fine to revert it too now that the related patches have been refreshed.