diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -102,11 +102,7 @@ def g(self, other, *args):
def wrap_comparison(f):
    @wraps(f)
    def g(self, other):
-        if isinstance(other, Quantity):
-            if other._dimensionality != self._dimensionality:
-                other = other.rescale(self._dimensionality)
-            other = other.magnitude
-        return f(self, other)
    return g


@@ -375,43 +371,48 @@ def __setitem__(self, key, value):
            value = value.rescale(self._dimensionality)
        self.magnitude[key] = value

    @with_doc(np.ndarray.__lt__)
    @wrap_comparison
-    def __lt__(self, other):
-        return self.magnitude < other

    @with_doc(np.ndarray.__le__)
    @wrap_comparison
-    def __le__(self, other):
-        return self.magnitude <= other

    @with_doc(np.ndarray.__eq__)
    def __eq__(self, other):
-        if isinstance(other, Quantity):
-            try:
-                other = other.rescale(self._dimensionality).magnitude
-            except ValueError:
-                return np.zeros(self.shape, '?')
-        return self.magnitude == other

    @with_doc(np.ndarray.__ne__)
    def __ne__(self, other):
-        if isinstance(other, Quantity):
-            try:
-                other = other.rescale(self._dimensionality).magnitude
-            except ValueError:
-                return np.ones(self.shape, '?')
-        return self.magnitude != other

    @with_doc(np.ndarray.__ge__)
    @wrap_comparison
-    def __ge__(self, other):
-        return self.magnitude >= other

    @with_doc(np.ndarray.__gt__)
    @wrap_comparison
-    def __gt__(self, other):
-        return self.magnitude > other

    #I don't think this implementation is particularly efficient,
    #perhaps there is something better

diff --git a/quantities/tests/test_comparison.py b/quantities/tests/test_comparison.py
@@ -19,6 +19,8 @@ def test_scalar_equality(self):
        self.assertEqual(pq.J == 2*pq.kg*pq.m**2/pq.s**2, [False])

        self.assertEqual(pq.J == pq.kg, [False])

    def test_scalar_inequality(self):
        self.assertEqual(pq.J != pq.erg, [True])
@@ -66,7 +68,7 @@ def test_array_equality(self):
        )
        self.assertQuantityEqual(
            [1, 2, 3, 4]*pq.J == [1, 22, 3, 44],
-            [1, 0, 1, 0]
        )

    def test_array_inequality(self):
@@ -80,7 +82,7 @@ def test_array_inequality(self):
        )
        self.assertQuantityEqual(
            [1, 2, 3, 4]*pq.J != [1, 22, 3, 44],
-            [0, 1, 0, 1]
        )

    def test_quantity_less_than(self):
@@ -92,9 +94,11 @@ def test_quantity_less_than(self):
            [50, 100, 150]*pq.cm < [1, 1, 1]*pq.m,
            [1, 0, 0]
        )
-        self.assertQuantityEqual(
-            [1, 2, 33]*pq.J < [1, 22, 3],
-            [0, 1, 0]
        )
        self.assertRaises(
            ValueError,
@@ -112,9 +116,11 @@ def test_quantity_less_than_or_equal(self):
            [50, 100, 150]*pq.cm <= [1, 1, 1]*pq.m,
            [1, 1, 0]
        )
-        self.assertQuantityEqual(
-            [1, 2, 33]*pq.J <= [1, 22, 3],
-            [1, 1, 0]
        )
        self.assertRaises(
            ValueError,
@@ -132,9 +138,11 @@ def test_quantity_greater_than_or_equal(self):
            [50, 100, 150]*pq.cm >= [1, 1, 1]*pq.m,
            [0, 1, 1]
        )
-        self.assertQuantityEqual(
-            [1, 2, 33]*pq.J >= [1, 22, 3],
-            [1, 0, 1]
        )
        self.assertRaises(
            ValueError,
@@ -152,13 +160,15 @@ def test_quantity_greater_than(self):
            [50, 100, 150]*pq.cm > [1, 1, 1]*pq.m,
            [0, 0, 1]
        )
-        self.assertQuantityEqual(
-            [1, 2, 33]*pq.J > [1, 22, 3],
-            [0, 0, 1]
        )
        self.assertRaises(
            ValueError,
            op.gt,
            [1, 2, 33]*pq.J,
-            [1, 22, 3]*pq.kg,
        )
diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
@@ -159,7 +159,7 @@ def test_fix(self):
            self.assertQuantityEqual(
                np.fix([2.1, 2.9, -2.1, -2.9] * pq.degF),
                [2., 2., -2., -2.] * pq.degF
-                )
        except ValueError as e:
            raise self.failureException(e)


diff --git a/quantities/umath.py b/quantities/umath.py
@@ -81,7 +81,7 @@ def gradient(f, *varargs):
                      for i,j  in zip( ret, varargsQuantities)])

@with_doc(np.cross)
-def cross (a, b , axisa=-1, axisb=-1, axisc=-1, axis=None):
    if not (isinstance(a, Quantity) and isinstance(b, Quantity)):
        return np.cross(a, b, axisa, axisb, axisc, axis)