Remove stray architecture_independent flag