Revert "Revert "Fixes for New Schedulers.""

This reverts commit d34d26c36e97e5af89a8989ffe464d0cb705c62d.