This reverts commit d22ba64276c0bbacb77d0670635f67f053a16c6b, which broke evaluations for armhf-linux.