Revert "Reorder extention."

This reverts commit 8edbbfc800f95ad8318bf0c42e3491228012bf16.