Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516)