Change usages of stub to allow