Revert "ondemandplus 3"

This reverts commit 10ecb418859c38ceae6520de78375bc6ba43808f.
Revert "ondemandplus 1"

This reverts commit d9d0664dc52db3b315083fa104d1412b3cb685a0.