Merge "Add util for reverting schedule mode"