Revert "ondemandplus 5"

This reverts commit 7ea371ad1c6a239ffdf1d5154b0d7ab644812b02.
Revert "ondemandplus 4"

This reverts commit caf71c532a5c70ee0cda45aba9e3452a24767092.