Revert "Solver compiles now [for real this time]"

This reverts commit f2501ad42b1031e6366c9675f3bebc1c328f783c.