Revert oti to branch master (from deleted branch)