Merge pull request #3499 from AndrzejKurek/fi-duplicate-buffers-revert

Revert a part of the sensitive information duplication changes