Simplified the scheduler very slightly

Change-Id: I57bba2feb35f3d1657e3a85a9087604ac08edc16
Merge "Simplified the scheduler very slightly"