(This change was already in place for other arches via r262957) Reviewed by: nwhitehorn MFC after: 1 week