Revert "intellidemand: Fixes & tuning"

This reverts commit 9f4c2ef0d47c3b611adee564ba92f40158f560ce.