Revert "wait_until_ready should wait for green"

This reverts commit 1554ea2ba1ade4789cee9d088dd53ed96c5ce717.