Merge "Revert "Remove duplicate configuration""