Readd scheduler to reenigne's commits.