Revert "Avoid duplication."