This reverts commit 43650d5837.
This fix do not work with CentOS x86_64. Since I haven't arm64 env, and
we have fix this soon before pike is release. Just revert this and fix
in the future.
Change-Id: Id9eb531de7d05051f38e3ed13b64ae7abf552767
Partial-Bug: #1715356