re-remove ora message as part of merge conflict resolution
Merge pull request #1970 from edx/adam/re-remove-ora-message

re-remove ora message as part of merge conflict resolution