Revert "Make this part of the code at least look similar"

This reverts commit 701af5d057f523c714517085469dec556aa76b28.

The test suite apparently expects this to be there... do this properly
later on.