Revert "Merge pull request #4611 from lduarte1991/lduarte-harvardx-pr10"

This reverts commit ac9013288ea599d485b5608a3f94b9be7b74071d, reversing
changes made to dad42f518cfcd9e4de25170c1ac5a1ec388a7bee.