Fixing a line that was stomped on by a bad merge
Merge pull request #1181 from edx/e0d/xqw-fix-stomped-code

Fixing a line that was stomped on by a bad merge