more work on CRM-12463, fixed api for backward compatibility