Revert "Fix an arch-dependency issue" This reverts commit a38d072d8416719aabe7094f2d2021ad6f1cf95f.
Description
No description provided
Revert "Fix an arch-dependency issue" This reverts commit a38d072d8416719aabe7094f2d2021ad6f1cf95f.