Revert "Squash Intellidemand"

This reverts commit 5b98ba08b110ed1d3d2600408051e2f8f85c25de.