Revert accidental push of changes to master

revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search"

This reverts commit e9c5d765ec94d63643486e074c457b9c190cb26b, reversing
changes made to 5ff9f3be88018a8980a1bde9efe2cb2c76fb3ae0.