Revert "Mc solver fixes"
Merge pull request #278 from qutip/revert-277-mc_solver_fixes

Revert "Mc solver fixes"