CR-IC-3489 restore old API