Revert "update: interactive + ondemand to mako baseline"

This reverts commit 95568def2648684852dee7153f03e073771f545f.