Revert "FunnelID fix"

This reverts commit e4db81e313c80de2cdfdd2a9f4308f96920043c9.
FunnelID fix