CRM-14024 - Get rid of redundant fn