Fix ARM failures (gh-413)

@certik commit 9ff6aed should be backported to 1.7.x.