Revert "fix for empty cluster issue"

This reverts commit dbb7b0f5fbf276d83fa463a972b1ea9ce9fec04f.