Roll back ctdmo, moved to another branch