Revert "PDI-10581 - changes needed for big-data-plugin to resolve"

This reverts commit 2a8a5ee474596f8e59a92b1129d49553cda3aafe.