Revert "Revert "8.5 schedule fix""
Merge pull request #488 from magfest/revert-487-revert-486-85_schedule

Revert "Revert "8.5 schedule fix""