Revert policy/api multiarch change

No match.