Deprecate old mutliarch code, phase 1

No match.