Shouldn't have removed that - adding it back CRM-12339