You can't hope to change *some* virtual methods of a hierarchy and
leave others untouched, they all have to be changed together.

This reverts commit 9f46bee92be38f2d59295cabd9f1fdb149708153.