Revert "Change TARGET_CPU_VARIANT"

This reverts commit 96cf0e18db459fda0a4656fd7b58e76bd2aa9c33.