Cope with Stateful interface change.