Revert "Support on-demand launch"