Revert "Fix issue 1947"

This reverts commit 75e01c616c9201dfeefaa54d648430c6e6b490a8.

Conflicts:
	sympy/utilities/runtests.py
Fix the doctest of evaluate