Undo yesterday's hack

Now that the implementations have been restructured, it shouldn't be
necessary any more.