In commit ea177a3ba7a7901f6467eadb0a407e03d46462fd, the internal
structure was changed.
Unbreak regression tests.