Revert "merged branch drak/start_on_demand (PR #7576)"

This reverts commit 7aa06818bc580b20981595306405d71d6683766e, reversing
changes made to 7bf8933662347f4f476c6a06c427d89de6cc4b43.