Revert "Fixture adjustment for external datastreams"

This reverts commit 26a0984d74dd1ad1afd8d6829ca0c27081d0f99c.