Revert "Merge pull request #18680 from stasm/1000895-system-once-ready"

This reverts commit ec49d12262cad25cc0c0bda80dcfeaa619f4d3ce, reversing
changes made to e7debccabc206f6fcc182bd66cfea50f849339a7.