Revert "update: interactive + ondemand"

This reverts commit ca5c7aac4e7c7ee3b3398b2113e691a285ef90c6.