Revert Schedule + Fix Missing Class