Revert "Solution changes"

This reverts commit 7f400e50558f798104756eb4ce74f87d227c1c3b.
Reverting prev commit