Merge "Revert "X86: Use the constant area for more operations.""