This reverts commit 8a071678. The test failure on 32-bit Arm should have been fixed by #86892. cc @nickdesaulniers @lntue