Revert "schedulers fixes"

This reverts commit 00918ca7243b73d6e4520e712b6602d2db4b4f11.