Revert "Merge branch 'cluster_partition'"

This reverts commit 795d3aa221030aee5af312333353dbb3a28f840f, reversing
changes made to 7ab5d3394b602974975cf8efce78b04eac002ab5.