This PR will not be merged. However, this change will live on in Jira issue https://edx-wiki.atlassian.net/browse/BLD-514 . For future generations to implement.