More archs
Merge bug25497
Bug 25497 really should have been branched from stable, so backport it.
stable to default no-op