Revert "Use correct CPU_VARIANT"

This reverts commit f677f03944e773fa8dddd32ec41f10cbdc28befd.