Revert "Revert "8.5 schedule fix""

Reverts magfest/ubersystem#487

So it turns out that reverting the previous pull requests means that FUTURE pull requests with the same commits will have those commits ignored, i.e., not included in the PR.

Git, why.