https://openedx.atlassian.net/browse/TNL-5903 This reverts commit d6787cd1. This reverts commit 0016d1af.
