This reverts commit cee0cd14.
This change is not needed in version 2 and the surrounding code has
disappeared mostly in version 3.