Revert "Fix the ordering of the teacher model"

This reverts commit 58086b4cfddca62dfc92cb0b8a16c1e6d3060751.

This commit caused issues on schedule and a lot of other controllers.
A fix should be implemented differently.