Revert "Change the way role checks for default cluster"

This reverts commit b00d1b2bb42b8da02d854360f83a4998e32b8487.