Revert "try being aggressive on the nosetests (this probably won't work)"

This reverts commit efbd6bb11ab949723e4f722254c1c0a44b310a23.