Automatic refactoring introduced changes unrelated modules (fixed in this revision)