Per discussion on the devel list, revert r27882.

Leif would like to revamp the ARM support in a different way, and will
submit a patch to do so in the future.
Minimalistic patch to ARM support, as suggested by Leif.  Note that
this patch has already gone into the v1.6 branch.

Leif would like to revamp the ARM support in a different way, and will
submit a patch to do so in the future.