Revert pull request #3466
Merge pull request #3723 from edx/db/revert-pr-3466

Revert pull request #3466