cleanup
CR-IC-3901 revert