Created a separate task for this https://edx-wiki.atlassian.net/browse/BLD-505 .