We probably need something here to make sure the flag in cluster metadata has propagated, right?