Add explicit replace vars back