Remove stray architecture_independent export