Back out extern-generating changes from setup.js