Backout ddb4df63c258 on a CLOSED TREE due to ARM v6 bustage.