Back out 6eb19014d780 (bug 861596) for Arm build bustage
CLOSED TREE