Revert "refs #8330. Fix unknown ICP entry issue."

This reverts commit 069f60c198ec48730a2cc944dd1acfddc4bc6402.
Merge branch 'feature/8330_icp_events' into develop