diff -r 9bb8f89fd31c -r 5331ba22c0e0 devtools/fill.py
--- a/devtools/fill.py	Thu May 26 18:24:55 2011 +0200
+++ b/devtools/fill.py	Fri May 27 09:56:26 2011 +0200
@@ -275,9 +275,6 @@
     :param choice_func: a function that takes an entity type, an attrname and
                         returns acceptable values for this attribute
     """
-    # XXX HACK, remove or fix asap
-    if etype in set(('String', 'Int', 'Float', 'Boolean', 'Date', 'CWGroup', 'CWUser')):
-        return []
     queries = []
     for index in xrange(entity_num):
         restrictions = []