Revert "Merge pull request #48 from adaptlearning/issue/#47"

This reverts commit 37344bb0ccb4cbd8ca0135b201c44c753a930fed, reversing
changes made to 1db3236cb3fbf9779c04d8940c510338e656404c.