Revert "IndirectDataAnalysis refactoring"

This reverts commit d498250fca8c42284530060d6b3f27ec914559a6.
Revert "Fix failing system tests"

This reverts commit 0df8c857511aeb71574d921f7dad130e795919df.
Revert "More general refactoring"

This reverts commit 4aa47109518d9ad9bacd4150357d83d134f1cfdf.