Revert "Clustering - common infrastructure."