Reversed a change made in fba89cf that broke mocha integration, as per #369.