CORE-3929: began migrating to cheshire