Revert "ODE-942: fixing a scheduler bug. Thanks Waruna for the patch."

This reverts commit ed5f024d4ba697b559476bd31589a2b604e3cce7.