Revert the changes from PR 5152

The changes in https://github.com/edx/edx-platform/pull/5152 appear to have introduced a performance problem on stage, so we're going to revert them for now.