Gone with the old substitute() (bogus) method, applying new one.