Restore earlier call semantics so that sample code works.