Reverts e157a999703f7ab33302e2cfef19d41f63ff874f - idd code changes