Revert solving changes to ensure it works