reverted some overzealous replacements