Back to regular mocha

Until I need actual char diffs again :-\