Revert "Merge pull request #332 from Indomitable/FixReviewSolutionChanges"

This reverts commit 3cb651ac5eb768ec18bc9c5badadf94ad255dc2c, reversing
changes made to ffdd5528e1531f126113eec64c04b7eebd5266f3.