edx/configuration — pull request #1708 by e0d (2014-11-18 22:17:34+00:00)
Title: reverting ae60c94cc26d760a5841c406a81b1eec40b35969

Reverting the commit I pushed straight to master.