CMS-4395 Remove deprecated API usage.