I fixed this problem in the Python code in a separate PR:  https://github.com/edx/edx-platform/pull/1080 .  Can you please remove the changes here?  It's highly preferable to change it before templating.