ONDEMAND as Default

Switch to Ondemand as default until Interactive will get critical patches from Google and Francisco