Revert "Mc solver fixes"

Whoops