Revert 15644; extensions need to remain self-contained