Revert "Refactor ARM subarchitecture parsing"