[x86] Revert r218588, r218589, and r218600. These patches were pursuing