This reverts commit 1aa8f5fcfba6701eb0181ea07c070d09ab0f4efd. It broke the other x86_32 fate instances.