Revert "Merge branch 'Sprint1'"

This reverts commit 9e76718510ffc8196a6a8b4089134bd122c27ac8, reversing
changes made to b02f97d70b5fb7f61bacad7f7fccde77b9c29ca8.