Revert "Ondemand tweaks from Semaphore"

This reverts commit ae27dd2c7f726ee28e0cd444f44d8eeaf2784d97.