Revert old variant for cluster_ready

Change-Id: I0e1969e35891a71a715274e047ee8d1bda86ea30