Fix /oer breakage from move.
Fix /oer breakage from move.


Former-commit-id: 6028739afece7773f9db7eea3bfd8131771fe36d [formerly eaeed79809bb969a12cfcbcce66a5e8f6831bf20] [formerly 08e60821144946d53937dc1c749d26ad4f88d877]
Former-commit-id: b1d89dd37383643aa55a59e4b84d55de9bb9716f [formerly a2cbc1c10589c863bd4e6795a09615e2a35ddcc6]
Former-commit-id: 92aaca020c4090c9d37649dcd0fe4751026b3547
sctjkc01/ofCourse,ritjoe/ofCourse,sctjkc01/ofCourse,ryansb/ofCourse,ryansb/ofCourse,ritjoe/ofCourse