Revert "intellidemand: cleanup"

This reverts commit 57c09d7a3dbfc6629d3a1f43026cf9407d4c4f2e.