Revert "use self*other.q <> other.p"
Revert "use self*other.q <> other.p"

This reverts commit 62c42c3e25aa241307ea1d55001c100d6503cc9f.

The evalf suite takes 15% longer with that change.

kaushik94/sympy,kaushik94/sympy,kaushik94/sympy