This reverts commit 1596d323 since
it broke cluster startup, clearly it needs more attention before
being ready.