Revert to restore armv6 support

This reverts commit a082baf84f31a8cccebe936d189e4e4c0baf7e0b.