Revert FLEX-34880 part 1
This reverts commit 0b5a634dabb00c04a492a08375e29c6885c1486f.
11 files changed