Revert "OnDemandRequest"

This reverts commit 6b171aafa93d453f346a52a530a3c4573422216b.