Back out PR 240 until edx-platform test failures can be resolved

Related to https://github.com/edx/edx-platform/pull/5825