Revert "Deal properly with self.fields = []"

This reverts commit 413b9226c83d399471dd77924c7d8df65cb47e82.