Fix upstream brain damage in scheduler