Also, remove ONLY_FOR_ARCHS_REASON since it's obviously wrong. Approved by: mentors (implicite approval)