remove changes I didn't mean to commit

ufl/functionspace.py

@@ -41,6 +41,20 @@ class BaseFunctionSpace(AbstractFunctionSpace, UFLObject):
 
     def __init__(self, domain, element, label=""):
         """Initialise."""
+        if domain is None:
+            # DOLFIN hack
+            # TODO: Is anything expected from element.cell in this case?
+            pass
+        else:
+            try:
+                domain_cell = domain.ufl_cell()
+            except AttributeError:
+                raise ValueError(
+                    "Expected non-abstract domain for initalization of function space."
+                )
+            else:
+                if element.cell != domain_cell:
+                    raise ValueError("Non-matching cell of finite element and domain.")
         AbstractFunctionSpace.__init__(self)
         self._label = label
         self._ufl_domain = domain