CRM-13067 reinstate change to fn signature lost during gitting