Attempt to fix reboot in relation to on demand

Refs #1238