edx/edx-platform — pull request #5355 by singingwolfboy (2014-09-23 22:44:13+00:00)
Title: Revert #3747

#3747 caused LMS-11464, and since it didn't add any tests, it's too risky to go into the release.