Revert "ONDEMAND as Default"

This reverts commit a51b4a2207049178ee2b0fc3eaac84fbf0b6025b.