unchanged functions from 4.3 that we need to over-ride as part of CRM-11977