Revert "Heavily tweaked intellidemand"

This reverts commit fb6dd9cc4e264a1822cd1721016d2301422a7e36.