[PATCH] x86: Remove noreplacement option