Temporarily revert r210953 in an attempt to bring the ARM buildbots
back.