Revert FLEX-34880 part 2

This reverts commit ff4067f56651082cecbe062f9cfd2aedbe44bf60.
1 file changed