Revert 55b0435bdeb by #ifdef'in it to ARMv7 platforms.