Revert "unEmbed extensions"

This reverts commit 729717b2e848cb258fcf9c14f58470bd266b738a.